Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

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

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index fb35aa6acc9e5352e5f6153919ce1aab7fc86a60..950e1214d5ff6a1b3d0b600a8326c534da139114 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -1,20 +1,20 @@
-/* Styles specific to a small screen, such as iPhone, Android, etc... */
+@import "parameters";
 
-* { -webkit-appearance: none; }
+/* Styles specific to a small screen, such as iPhone, Android, etc... */
 
-/* Default rules for the body of every page */
+input[type="submit"],
+input[type="text"] {
+  -webkit-appearance: none;
+}
 
 .column-1 {
   width: 100%;
 }
 
-/* Rules for the whole left sidebar, including the logo */
-
 #menu-icon {
-  display: inline-block;
+  display: inline-block !important;
 }
 
-
 nav.primary,
 nav.secondary {
   float: none !important;
@@ -24,28 +24,38 @@ nav.secondary {
 }
 
 header {
-  min-height: 54px;
-  height: 100%;
+  height: auto;
+  min-height: $headerHeight;
   background: #fff;
-  clear: both;
-  h1 { padding-bottom: 17px; }
-  &.closed {
-    nav.primary,
-    nav.secondary {
-      display: none;
-    }
+
+  h1 {
+    padding-bottom: 15px;
+  }
+
+  &.closed nav {
+    display: none;
+  }
+
+  .search_forms {
+    display: block;
   }
 }
 
-.mobile-hide { display: none !important; }
+#sidebar .search_forms,
+#edit_tab,
+#export_tab {
+  display: none;
+}
 
 nav.primary {
   padding: 0;
+
   ul, li {
     border: none;
     border-radius: 0;
     width: 100%;
   }
+
   ul {
     border-top: 1px solid #eee;
     li {
@@ -62,58 +72,73 @@ nav.primary {
 }
 
 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;
+      }
+    }
   }
 }
 
-.map-layout {
-  #sidebar {
-    width: 60%;
-  }
-  #content {
-    position: static;
-    display: block;
-    height: 600px;
-  }
+#compact-secondary-nav {
+  display: none;
 }
 
-.content_map {
-  width: 100%;
-  border: none;
-  float: none;
-  height: 200px;
-  max-height: none;
-  min-height: auto;
+.compact-hide {
+  display: inline-block;
 }
 
-/* Rules for the map UI */
-
-.layers-ui {
-  .leaflet-container {
-    display: none;
+.map-layout {
+  #sidebar, #map {
+    position: relative;
+    overflow-x: hidden;
+    width: 100%;
+    height: 50%;
   }
 
-  li {
-    border-radius: 0;
-    margin-bottom: 0;
-
-    &:first-child {
-      border-radius: 4px 4px 0 0;
+  .overlay-sidebar {
+    #sidebar {
+      width: 300px;
     }
 
-    &:last-child {
-      border-radius: 0 0 4px 4px;
+    #map {
+      height: 100%;
     }
   }
 
-  .overlay-layers p {
-    display: none;
+  #map-ui {
+    z-index: 9999;
+    width: 100%;
+    overflow-y: scroll;
   }
 }
 
+#sidebar .welcome {
+  display: none !important;
+}
+
+.leaflet-top.leaflet-right {
+  top: 10px !important;
+  z-index: 0;
+}
+
+.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 {
@@ -161,3 +186,7 @@ nav.secondary {
     display: none;
   }
 }
+
+.site-about #content .attr h1 {
+  font-size: 28px;
+}