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

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

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 12e21c7d8b8e9f52b007d4b0655820604d94f426..0b62256a941686ab623e7740e36079cabe79ca08 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -9,10 +9,6 @@ body.small {
     -webkit-appearance: none;
   }
 
     -webkit-appearance: none;
   }
 

-  .column-1 {
-    width: 100%;
-  }
-

   #menu-icon {
     display: inline-block !important;
   }
   #menu-icon {
     display: inline-block !important;
   }


@@ -71,22 +67,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;
-        }
-      }

     }
   }
 
     }
   }
 


@@ -97,34 +87,7 @@ body.small {
   .compact-hide {
     display: inline-block;
   }
   .compact-hide {
     display: inline-block;
   }

-
-  &.map-layout {
-    #sidebar, #map {
-      position: relative;
-      overflow-x: hidden;
-      width: 100%;
-      height: 50%;
-    }
-
-    .overlay-sidebar {
-      #sidebar {
-        position: absolute;
-        width: 300px;
-        height: auto;
-        overflow: hidden;
-      }
-
-      #map {
-        height: 100%;
-      }
-    }
-
-    #map-ui {
-      z-index: 9999;
-      width: 100%;
-      overflow-y: scroll;
-    }
-  }
+  

 
   .overlay-sidebar #sidebar .welcome.visible {
     display: none;
 
   .overlay-sidebar #sidebar .welcome.visible {
     display: none;


@@ -138,15 +101,6 @@ body.small {
     top: 10px !important;
   }
 
     top: 10px !important;
   }
 

-  .content_map {
-    width: 100%;
-    border: none;
-    float: none;
-    height: 200px;
-    max-height: none;
-    min-height: auto;
-  }
-

   /* Rules for the login form */
 
   #login_login input#user_email {
   /* Rules for the login form */
 
   #login_login input#user_email {


@@ -182,21 +136,38 @@ body.small {
     top: auto;
   }
 
     top: auto;
   }
 

-  /* Rules for the sign-up page */
+  &.site-about #content .attr h1 {
+    font-size: 28px;
+  }
+
+}

 
 

-  &.user-new,
-  &.user-create {
-    .col6 {
+@media (max-width: 767.98px) {
+  body.map-layout {
+    #sidebar, #map {
+      position: relative;
+      overflow-x: hidden;

       width: 100%;
       width: 100%;

+      height: 50%;

     }
 
     }
 

-    .aside {
-      display: none;
+    .overlay-sidebar {
+      #sidebar {
+        position: absolute;
+        width: 300px;
+        height: auto;
+        overflow: hidden;
+      }
+
+      #map {
+        height: 100%;
+      }

     }
     }

-  }

 
 

-  &.site-about #content .attr h1 {
-    font-size: 28px;
+    #map-ui {
+      z-index: 9999;
+      width: 100%;
+      overflow-y: scroll;
+    }

   }
   }

-

 }
 }