Merge remote-tracking branch 'upstream/pull/2444'

[rails.git] / app / assets / stylesheets / small.scss

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 1865572a3acbe7f5d7865ffb95d8f1015bfe9359..12e21c7d8b8e9f52b007d4b0655820604d94f426 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -98,7 +98,7 @@ body.small {
     display: inline-block;
   }
 
-  .map-layout {
+  &.map-layout {
     #sidebar, #map {
       position: relative;
       overflow-x: hidden;
@@ -108,7 +108,10 @@ body.small {
 
     .overlay-sidebar {
       #sidebar {
+        position: absolute;
         width: 300px;
+        height: auto;
+        overflow: hidden;
       }
 
       #map {
@@ -123,13 +126,16 @@ body.small {
     }
   }
 
-  #sidebar .welcome {
-    display: none !important;
+  .overlay-sidebar #sidebar .welcome.visible {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar #banner {
+    display: none;
   }
 
   .leaflet-top.leaflet-right {
     top: 10px !important;
-    z-index: 0;
   }
 
   .content_map {
@@ -178,8 +184,8 @@ body.small {
 
   /* Rules for the sign-up page */
 
-  .user-new,
-  .user-create {
+  &.user-new,
+  &.user-create {
     .col6 {
       width: 100%;
     }
@@ -189,7 +195,7 @@ body.small {
     }
   }
 
-  .site-about #content .attr h1 {
+  &.site-about #content .attr h1 {
     font-size: 28px;
   }