瀏覽代碼

Merge branch 'hotfix/footer_overlaps'

Olivier Massot 2 年之前
父節點
當前提交
bbde3e22e1
共有 19 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      ot_templating/Resources/Public/assets/Classic/style/_states.scss
  2. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-blue.css
  3. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-blue.css.map
  4. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-green.css
  5. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-green.css.map
  6. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-grey.css
  7. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-grey.css.map
  8. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css
  9. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css.map
  10. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css
  11. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css.map
  12. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-orange.css
  13. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-orange.css.map
  14. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-purple.css
  15. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-purple.css.map
  16. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-red.css
  17. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-red.css.map
  18. 0 0
      ot_templating/Resources/Public/assets/Classic/style/style.css
  19. 0 0
      ot_templating/Resources/Public/assets/Classic/style/style.css.map

+ 4 - 2
ot_templating/Resources/Public/assets/Classic/style/_states.scss

@@ -16,8 +16,11 @@ $menu-font-color: $menu-font-color;
 
 // Small screens
 @media screen and (max-width: 900px) {
+  body {
+    margin-bottom: 310px !important;
+  }
 
-//  Topbar
+  //  Topbar
   #topbar {
     height: auto;
     flex-direction: column;
@@ -47,7 +50,6 @@ $menu-font-color: $menu-font-color;
   //   Content
   .main {
     flex-direction: column;
-    margin-bottom: 240px;
   }
 
   .centralcol {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-blue.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-blue.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-green.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-green.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-grey.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-grey.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-orange.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-orange.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-purple.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-purple.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-red.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-red.css.map


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/style.css


File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/style.css.map


Some files were not shown because too many files changed in this diff