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

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

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index 12e21c7d8b8e9f52b007d4b0655820604d94f426..808b8caa6f45a8b9fa0ae73323d5d00b237028d1 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -2,17 +2,7 @@
 
 /* Styles specific to a small screen, such as iPhone, Android, etc... */
 
-body.small {
-
-  input[type="submit"],
-  input[type="text"] {
-    -webkit-appearance: none;
-  }
-
-  .column-1 {
-    width: 100%;
-  }
-
+body.small-nav {
   #menu-icon {
     display: inline-block !important;
   }
@@ -71,22 +61,16 @@ body.small {
         }
       }
     }
+
+    .btn-group {
+      width: 100%;
+      padding: 10px;
+    }
   }
 
   nav.secondary {
-    border-bottom: 1px solid #eee;
-
     .user-menu {
-      display: block;
       width: 100%;
-      margin-left: 0;
-      > li {
-        width: 49%;
-        > a {
-          width: 100%;
-          text-align: center;
-        }
-      }
     }
   }
 
@@ -98,7 +82,21 @@ body.small {
     display: inline-block;
   }
 
-  &.map-layout {
+  .overlay-sidebar #sidebar .welcome.visible {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar #banner {
+    display: none;
+  }
+
+  .leaflet-top.leaflet-right {
+    top: 10px !important;
+  }
+}
+
+@media (max-width: 767.98px) {
+  body.map-layout {
     #sidebar, #map {
       position: relative;
       overflow-x: hidden;
@@ -125,28 +123,9 @@ body.small {
       overflow-y: scroll;
     }
   }
+}
 
-  .overlay-sidebar #sidebar .welcome.visible {
-    display: none;
-  }
-
-  .overlay-sidebar #sidebar #banner {
-    display: none;
-  }
-
-  .leaflet-top.leaflet-right {
-    top: 10px !important;
-  }
-
-  .content_map {
-    width: 100%;
-    border: none;
-    float: none;
-    height: 200px;
-    max-height: none;
-    min-height: auto;
-  }
-
+@media (max-width: 575.98px) {
   /* Rules for the login form */
 
   #login_login input#user_email {
@@ -167,36 +146,4 @@ body.small {
   #login_openid_buttons td {
     padding: 2px;
   }
-
-  /* Rules for the user view */
-
-  .user_map {
-    width: 100% !important;
-    height: 300px !important;
-  }
-
-  #userinformation .deemphasize {
-    position: relative;
-    right: auto; left: auto;
-    margin-top: 10px;
-    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;
-  }
-
 }