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 12e21c7d8b8e9f52b007d4b0655820604d94f426..623d0f6b44c11d136b19a7d8e8b60d85cf7d38d3 100644 (file)
--- a/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@ -1,202 +1,187 @@
 @import "parameters";
 
 /* Styles specific to a small screen, such as iPhone, Android, etc... */
 @import "parameters";
 
 /* Styles specific to a small screen, such as iPhone, Android, etc... */

+@media (max-width: 640px) {
+  body {

 
 

-body.small {
+    input[type="submit"],
+    input[type="text"] {
+      -webkit-appearance: none;
+    }

 
 

-  input[type="submit"],
-  input[type="text"] {
-    -webkit-appearance: none;
-  }
+    .column-1 {
+      width: 100%;
+    }

 
 

-  .column-1 {
-    width: 100%;
-  }
+    #menu-icon {
+      display: inline-block !important;
+    }

 
 

-  #menu-icon {
-    display: inline-block !important;
-  }
+    nav.primary,
+    nav.secondary {
+      float: none !important;
+      position: relative;
+      display: block;
+      clear: both;
+    }

 
 

-  nav.primary,
-  nav.secondary {
-    float: none !important;
-    position: relative;
-    display: block;
-    clear: both;
-  }
+    header {
+      height: auto;
+      min-height: $headerHeight;
+      background: #fff;

 
 

-  header {
-    height: auto;
-    min-height: $headerHeight;
-    background: #fff;
+      h1 {
+        padding-bottom: 15px;
+      }

 
 

-    h1 {
-      padding-bottom: 15px;
+      &.closed nav {
+        display: none;
+      }
+
+      .search_forms {
+        display: block;
+      }

     }
 
     }
 

-    &.closed nav {
+    #sidebar .search_forms,
+    #edit_tab,
+    #export_tab {

       display: none;
     }
 
       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;

 
 

-    ul, li {
-      border: none;
-      border-radius: 0;
-      width: 100%;
-    }
+        li {
+          border-bottom: 1px solid #eee;
+          border-right: none;

 
 

-    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;
+          > a {
+            border-radius: 0;
+            width: 100%;
+            text-align: center;
+            font-size: 15px;
+          }

         }
       }
         }
       }

-    }
-  }

 
 

-  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;
-        }
+      .btn-group {
+        width: 100%;
+        padding: 10px;

       }
     }
       }
     }

-  }

 
 

-  #compact-secondary-nav {
-    display: none;
-  }
+    nav.secondary {
+      .user-menu {
+        width: 100%;
+      }
+    }

 
 

-  .compact-hide {
-    display: inline-block;
-  }
+    #compact-secondary-nav {
+      display: none;
+    }

 
 

-  &.map-layout {
-    #sidebar, #map {
-      position: relative;
-      overflow-x: hidden;
-      width: 100%;
-      height: 50%;
+    .compact-hide {
+      display: inline-block;

     }
 
     }
 

-    .overlay-sidebar {
-      #sidebar {
-        position: absolute;
-        width: 300px;
-        height: auto;
-        overflow: hidden;
+    &.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 {
-        height: 100%;
+      #map-ui {
+        z-index: 9999;
+        width: 100%;
+        overflow-y: scroll;

       }
     }
 
       }
     }
 

-    #map-ui {
-      z-index: 9999;
-      width: 100%;
-      overflow-y: scroll;
+    .overlay-sidebar #sidebar .welcome.visible {
+      display: none;

     }
     }

-  }
-
-  .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;
-  }
+    .overlay-sidebar #sidebar #banner {
+      display: none;
+    }

 
 

-  /* Rules for the login form */
+    .leaflet-top.leaflet-right {
+      top: 10px !important;
+    }

 
 

-  #login_login input#user_email {
-    width: 100%;
-    max-width: 18em;
-  }
+    .content_map {
+      width: 100%;
+      border: none;
+      float: none;
+      height: 200px;
+      max-height: none;
+      min-height: auto;
+    }

 
 

-  #login_login input#user_password {
-    width: 100%;
-    max-width: 18em;
-  }
+    /* Rules for the login form */

 
 

-  #login_login input#openid_url {
-    width: 100%;
-    max-width: 18em;
-  }
+    #login_login input#user_email {
+      width: 100%;
+      max-width: 18em;
+    }

 
 

-  #login_openid_buttons td {
-    padding: 2px;
-  }
+    #login_login input#user_password {
+      width: 100%;
+      max-width: 18em;
+    }

 
 

-  /* Rules for the user view */
+    #login_login input#openid_url {
+      width: 100%;
+      max-width: 18em;
+    }

 
 

-  .user_map {
-    width: 100% !important;
-    height: 300px !important;
-  }
+    #login_openid_buttons td {
+      padding: 2px;
+    }

 
 

-  #userinformation .deemphasize {
-    position: relative;
-    right: auto; left: auto;
-    margin-top: 10px;
-    top: auto;
-  }
+    /* Rules for the user view */

 
 

-  /* Rules for the sign-up page */
+    .user_map {
+      width: 100% !important;
+      height: 300px !important;
+    }

 
 

-  &.user-new,
-  &.user-create {
-    .col6 {
-      width: 100%;
+    #userinformation .deemphasize {
+      position: relative;
+      right: auto;
+      left: auto;
+      margin-top: 10px;
+      top: auto;

     }
 
     }
 

-    .aside {
-      display: none;
+    &.site-about #content .attr h1 {
+      font-size: 28px;

     }
     }

-  }

 
 

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

   }
   }

-

 }
 }