tonyair/silverstripe-webpack
1
1
Fork 0
mirror of https://github.com/a2nt/silverstripe-webpack.git synced 2024-06-28 07:29:24 +02:00
Code Issues Projects Releases Wiki Activity

I18N support + minor updates

Browse Source
This commit is contained in:
Tony Air 2018-07-29 19:43:18 +07:00
parent 856d54de3c
commit 18085772c5
5 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/client/src/scss/_components/_ui.elemental.scss
View File

@ -14,7 +14,7 @@ h1 {
// remove paddings of the slideshow // remove paddings of the slideshow
&.dynamic__elements__image__elements__elementimage, &.dynamic__elements__image__elements__elementimage,
&.dynamic__elements__flexslider__elements__elementslideshow { &.site__elements__sliderelement {
padding: 0; padding: 0;
} }
} }
@ -26,3 +26,9 @@ h1 {
padding: 0; padding: 0;
} }
} }
// add top/bottom paddings for basic Include/Content.ss forms
.page-content > .form-container {
position: relative;
padding: ($grid-gutter-height / 2) 0;
}

35
app/client/src/scss/_layout.scss
View File

@ -6,24 +6,33 @@
body.shrink {} body.shrink {}
// sticky footer // sticky footer
html, body { @media (min-width: map-get($grid-breakpoints, "sm")) {
height: 100%; html, body {
min-height: 100%; height: 100%;
} min-height: 100%;
}
.wrapper { .wrapper {
min-height: 100%; min-height: 100%;
padding-top: 7.4rem; padding-top: $grid-gutter-height;
padding-bottom: 2rem; padding-bottom: 2rem;
} }
.site-footer { .site-footer {
height: 2rem; height: 2rem;
margin-top: -2rem; margin-top: -2rem;
line-height: 2rem; }
} }
// element col paddings // element col paddings
.col-block { .col-block {
padding: $grid-gutter-height / 4; padding: $grid-gutter-height / 4;
} }
// rewrite btn opacity on hover
.btn {
&:hover,
&:focus {
opacity: 1;
}
}

6
app/lang/en.yml Normal file
View File

@ -0,0 +1,6 @@
en:
Page:
LOADINGTEXT: "LOADING .."
JAVASCRIPTREQUIRED: "Please, enable javascript!"
UPGRADEBROWSER: "Upgrade your browser"
OUTDATEDBROWSER: "You are using an outdated browser. For a faster, safer browsing experience, upgrade for free today."

6
app/lang/ru.yml Normal file
View File

@ -0,0 +1,6 @@
ru:
Page:
LOADINGTEXT: "ЗАГРУЗКА .."
JAVASCRIPTREQUIRED: "Для корректной работы страницы требуется включить Javascript!"
UPGRADEBROWSER: "Обновите браузер!"
OUTDATEDBROWSER: "Вы используете устаревшую версию браузера. Обновите ваш браузер сейчас для повышения уровня безопасности вашей системы."

2
app/templates/Includes/Content.ss
View File

@ -5,7 +5,7 @@
$ElementalArea $ElementalArea
<% if $Form %> <% if $Form %>
<div class="container"> <div class="form-container container">
$Form $Form
</div> </div>
<% end_if %> <% end_if %>