From 18085772c5f15b7db5988456e7b6aed5decfe9d8 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@thewebdevelopmentagency.com>
Date: Sun, 29 Jul 2018 19:43:18 +0700
Subject: [PATCH] I18N support + minor updates

---
 .../src/scss/_components/_ui.elemental.scss   |  8 ++++-
 app/client/src/scss/_layout.scss              | 35 ++++++++++++-------
 app/lang/en.yml                               |  6 ++++
 app/lang/ru.yml                               |  6 ++++
 app/templates/Includes/Content.ss             |  2 +-
 5 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 app/lang/en.yml
 create mode 100644 app/lang/ru.yml

diff --git a/app/client/src/scss/_components/_ui.elemental.scss b/app/client/src/scss/_components/_ui.elemental.scss
index 498590d..a9da826 100644
--- a/app/client/src/scss/_components/_ui.elemental.scss
+++ b/app/client/src/scss/_components/_ui.elemental.scss
@@ -14,7 +14,7 @@ h1 {
 
     // remove paddings of the slideshow
     &.dynamic__elements__image__elements__elementimage,
-    &.dynamic__elements__flexslider__elements__elementslideshow {
+    &.site__elements__sliderelement {
         padding: 0;
     }
 }
@@ -26,3 +26,9 @@ h1 {
         padding: 0;
     }
 }
+
+// add top/bottom paddings for basic Include/Content.ss forms
+.page-content > .form-container {
+    position: relative;
+    padding: ($grid-gutter-height / 2) 0;
+}
diff --git a/app/client/src/scss/_layout.scss b/app/client/src/scss/_layout.scss
index 9d2b66b..cffd280 100644
--- a/app/client/src/scss/_layout.scss
+++ b/app/client/src/scss/_layout.scss
@@ -6,24 +6,33 @@
 body.shrink {}
 
 // sticky footer
-html, body {
-    height: 100%;
-    min-height: 100%;
-}
+@media (min-width: map-get($grid-breakpoints, "sm")) {
+    html, body {
+        height: 100%;
+        min-height: 100%;
+    }
 
-.wrapper {
-    min-height: 100%;
-    padding-top: 7.4rem;
-    padding-bottom: 2rem;
-}
+    .wrapper {
+        min-height: 100%;
+        padding-top: $grid-gutter-height;
+        padding-bottom: 2rem;
+    }
 
-.site-footer {
-    height: 2rem;
-    margin-top: -2rem;
-    line-height: 2rem;
+    .site-footer {
+        height: 2rem;
+        margin-top: -2rem;
+    }
 }
 
 // element col paddings
 .col-block {
     padding: $grid-gutter-height / 4;
 }
+
+// rewrite btn opacity on hover
+.btn {
+    &:hover,
+    &:focus {
+        opacity: 1;
+    }
+}
diff --git a/app/lang/en.yml b/app/lang/en.yml
new file mode 100644
index 0000000..9e80699
--- /dev/null
+++ b/app/lang/en.yml
@@ -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."
diff --git a/app/lang/ru.yml b/app/lang/ru.yml
new file mode 100644
index 0000000..5daebea
--- /dev/null
+++ b/app/lang/ru.yml
@@ -0,0 +1,6 @@
+ru:
+  Page:
+    LOADINGTEXT: "ЗАГРУЗКА .."
+    JAVASCRIPTREQUIRED: "Для корректной работы страницы требуется включить Javascript!"
+    UPGRADEBROWSER: "Обновите браузер!"
+    OUTDATEDBROWSER: "Вы используете устаревшую версию браузера. Обновите ваш браузер сейчас для повышения уровня безопасности вашей системы."
diff --git a/app/templates/Includes/Content.ss b/app/templates/Includes/Content.ss
index b855e20..82d353d 100644
--- a/app/templates/Includes/Content.ss
+++ b/app/templates/Includes/Content.ss
@@ -5,7 +5,7 @@
         $ElementalArea
 
         <% if $Form %>
-        <div class="container">
+        <div class="form-container container">
             $Form
         </div>
         <% end_if %>