Merge branch 'master' of github.com:openstreetmap/openstreetmap-website into mobile...

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

diff --git a/app/assets/stylesheets/small.scss b/app/assets/stylesheets/small.scss
index e9d0a477901c0d9caa9c902a57b0330293cda9ac..623d0f6b44c11d136b19a7d8e8b60d85cf7d38d3 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -1,192 +1,187 @@
 @import "parameters";
 
 /* Styles specific to a small screen, such as iPhone, Android, etc... */
+@media (max-width: 640px) {
+  body {
 
-input[type="submit"],
-input[type="text"] {
-  -webkit-appearance: none;
-}
-
-.column-1 {
-  width: 100%;
-}
+    input[type="submit"],
+    input[type="text"] {
+      -webkit-appearance: none;
+    }
 
-#menu-icon {
-  display: inline-block !important;
-}
+    .column-1 {
+      width: 100%;
+    }
 
-nav.primary,
-nav.secondary {
-  float: none !important;
-  position: relative;
-  display: block;
-  clear: both;
-}
+    #menu-icon {
+      display: inline-block !important;
+    }
 
-header {
-  height: auto;
-  min-height: $headerHeight;
-  background: #fff;
+    nav.primary,
+    nav.secondary {
+      float: none !important;
+      position: relative;
+      display: block;
+      clear: both;
+    }
 
-  h1 {
-    padding-bottom: 15px;
-  }
+    header {
+      height: auto;
+      min-height: $headerHeight;
+      background: #fff;
 
-  &.closed nav {
-    display: none;
-  }
+      h1 {
+        padding-bottom: 15px;
+      }
 
-  .search_form {
-    display: block;
-  }
-}
+      &.closed nav {
+        display: none;
+      }
 
-#sidebar .search_form,
-#edit_tab,
-#export_tab {
-  display: none;
-}
+      .search_forms {
+        display: block;
+      }
+    }
 
-nav.primary {
-  padding: 0;
+    #sidebar .search_forms,
+    #edit_tab,
+    #export_tab {
+      display: none;
+    }
 
-  ul, li {
-    border: none;
-    border-radius: 0;
-    width: 100%;
-  }
+    nav.primary {
+      padding: 0;
 
-  ul {
-    border-top: 1px solid #eee;
-    li {
-      border-bottom: 1px solid #eee;
-      border-right: none;
-      > a {
+      ul, li {
+        border: none;
         border-radius: 0;
         width: 100%;
-        text-align: center;
-        font-size: 15px;
+      }
+
+      ul {
+        border-top: 1px solid #eee;
+
+        li {
+          border-bottom: 1px solid #eee;
+          border-right: none;
+
+          > a {
+            border-radius: 0;
+            width: 100%;
+            text-align: center;
+            font-size: 15px;
+          }
+        }
+      }
+
+      .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;
+    nav.secondary {
+      .user-menu {
+        width: 100%;
       }
     }
-  }
-}
 
-#compact-secondary-nav {
-  display: none;
-}
+    #compact-secondary-nav {
+      display: none;
+    }
 
-.compact-hide {
-  display: inline-block;
-}
+    .compact-hide {
+      display: inline-block;
+    }
 
-.map-layout {
-  #sidebar, #map {
-    position: relative;
-    overflow-x: hidden;
-    width: 100%;
-    height: 50%;
-  }
+    &.map-layout {
+      #sidebar, #map {
+        position: relative;
+        overflow-x: hidden;
+        width: 100%;
+        height: 50%;
+      }
 
-  .overlay-sidebar {
-    #sidebar {
-      width: 300px;
-    }
+      .overlay-sidebar {
+        #sidebar {
+          position: absolute;
+          width: 300px;
+          height: auto;
+          overflow: hidden;
+        }
+
+        #map {
+          height: 100%;
+        }
+      }
 
-    #map {
-      height: 100%;
+      #map-ui {
+        z-index: 9999;
+        width: 100%;
+        overflow-y: scroll;
+      }
     }
-  }
 
-  #map-ui {
-    z-index: 9999;
-    width: 100%;
-    overflow-y: scroll;
-  }
-}
-
-#sidebar .welcome {
-  display: none !important;
-}
+    .overlay-sidebar #sidebar .welcome.visible {
+      display: none;
+    }
 
-.leaflet-top.leaflet-right {
-  top: 10px !important;
-  z-index: 0;
-}
+    .overlay-sidebar #sidebar #banner {
+      display: none;
+    }
 
-.content_map {
-  width: 100%;
-  border: none;
-  float: none;
-  height: 200px;
-  max-height: none;
-  min-height: auto;
-}
+    .leaflet-top.leaflet-right {
+      top: 10px !important;
+    }
 
-/* Rules for the login form */
+    .content_map {
+      width: 100%;
+      border: none;
+      float: none;
+      height: 200px;
+      max-height: none;
+      min-height: auto;
+    }
 
-#login_login input#user_email {
-  width: 100%;
-  max-width: 18em;
-}
+    /* Rules for the login form */
 
-#login_login input#user_password {
-  width: 100%;
-  max-width: 18em;
-}
+    #login_login input#user_email {
+      width: 100%;
+      max-width: 18em;
+    }
 
-#login_login input#openid_url {
-  width: 100%;
-  max-width: 18em;
-}
+    #login_login input#user_password {
+      width: 100%;
+      max-width: 18em;
+    }
 
-#login_openid_buttons td {
-  padding: 2px;
-}
+    #login_login input#openid_url {
+      width: 100%;
+      max-width: 18em;
+    }
 
-/* Rules for the user view */
+    #login_openid_buttons td {
+      padding: 2px;
+    }
 
-.user_map {
-  width: 100% !important;
-  height: 300px !important;
-}
+    /* Rules for the user view */
 
-#userinformation .deemphasize {
-  position: relative;
-  right: auto; left: auto;
-  margin-top: 10px;
-  top: auto;
-}
+    .user_map {
+      width: 100% !important;
+      height: 300px !important;
+    }
 
-/* Rules for the sign-up page */
+    #userinformation .deemphasize {
+      position: relative;
+      right: auto;
+      left: auto;
+      margin-top: 10px;
+      top: auto;
+    }
 
-.user-new,
-.user-create {
-  .col6 {
-    width: 100%;
-  }
+    &.site-about #content .attr h1 {
+      font-size: 28px;
+    }
 
-  .aside {
-    display: none;
   }
 }
-
-.site-about #content .attr h1 {
-  font-size: 28px;
-}