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

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

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 0152e8b30c8705ffa29aa73ddfe96338996f684e..e5634e11d0e71aaa28df3ca0aaf72cdd2044a0ac 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -71,22 +71,16 @@ body.small {
         }
       }
     }
         }
       }
     }

+
+    .btn-group {
+      width: 100%;
+      padding: 10px;
+    }

   }
 
   nav.secondary {
   }
 
   nav.secondary {

-    border-bottom: 1px solid #eee;
-

     .user-menu {
     .user-menu {

-      display: block;

       width: 100%;
       width: 100%;

-      margin-left: 0;
-      > li {
-        width: 49%;
-        > a {
-          width: 100%;
-          text-align: center;
-        }
-      }

     }
   }
 
     }
   }
 


@@ -126,14 +120,16 @@ body.small {
     }
   }
 
     }
   }
 

-  #sidebar .welcome,
-  #sidebar #banner {
-    display: none !important;
+  .overlay-sidebar #sidebar .welcome.visible {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar #banner {
+    display: none;

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

-    z-index: 0;

   }
 
   .content_map {
   }
 
   .content_map {


@@ -180,19 +176,6 @@ body.small {
     top: auto;
   }
 
     top: auto;
   }
 

-  /* Rules for the sign-up page */
-
-  &.user-new,
-  &.user-create {
-    .col6 {
-      width: 100%;
-    }
-
-    .aside {
-      display: none;
-    }
-  }
-

   &.site-about #content .attr h1 {
     font-size: 28px;
   }
   &.site-about #content .attr h1 {
     font-size: 28px;
   }