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

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

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 1865572a3acbe7f5d7865ffb95d8f1015bfe9359..984364736b35290d8cb38a272f1016711d6bdf22 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -98,7 +98,7 @@ body.small {
     display: inline-block;
   }
 
     display: inline-block;
   }
 

-  .map-layout {
+  &.map-layout {

     #sidebar, #map {
       position: relative;
       overflow-x: hidden;
     #sidebar, #map {
       position: relative;
       overflow-x: hidden;


@@ -108,7 +108,10 @@ body.small {
 
     .overlay-sidebar {
       #sidebar {
 
     .overlay-sidebar {
       #sidebar {

+        position: absolute;

         width: 300px;
         width: 300px;

+        height: auto;
+        overflow: hidden;

       }
 
       #map {
       }
 
       #map {


@@ -123,13 +126,13 @@ body.small {
     }
   }
 
     }
   }
 

-  #sidebar .welcome {
+  #sidebar .welcome,
+  #sidebar #banner {

     display: none !important;
   }
 
   .leaflet-top.leaflet-right {
     top: 10px !important;
     display: none !important;
   }
 
   .leaflet-top.leaflet-right {
     top: 10px !important;

-    z-index: 0;

   }
 
   .content_map {
   }
 
   .content_map {


@@ -178,8 +181,8 @@ body.small {
 
   /* Rules for the sign-up page */
 
 
   /* Rules for the sign-up page */
 

-  .user-new,
-  .user-create {
+  &.user-new,
+  &.user-create {

     .col6 {
       width: 100%;
     }
     .col6 {
       width: 100%;
     }


@@ -189,7 +192,7 @@ body.small {
     }
   }
 
     }
   }
 

-  .site-about #content .attr h1 {
+  &.site-about #content .attr h1 {

     font-size: 28px;
   }
 
     font-size: 28px;
   }