Merge branch 'jfire2' into routing

[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 d6fb6f7580cfb54dc125360a5ae63b8385637133..950e1214d5ff6a1b3d0b600a8326c534da139114 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -1,21 +1,20 @@
+@import "parameters";
+
 /* Styles specific to a small screen, such as iPhone, Android, etc... */
 
 input[type="submit"],
-input[type="text"] { -webkit-appearance: none; }
-
-/* Default rules for the body of every page */
+input[type="text"] {
+  -webkit-appearance: none;
+}
 
 .column-1 {
   width: 100%;
 }
 
-/* Rules for the whole left sidebar, including the logo */
-
 #menu-icon {
   display: inline-block !important;
 }
 
-
 nav.primary,
 nav.secondary {
   float: none !important;
@@ -25,32 +24,38 @@ nav.secondary {
 }
 
 header {
-  min-height: 54px;
   height: auto;
+  min-height: $headerHeight;
   background: #fff;
-  border-bottom: 1px solid #ddd;
-  clear: both;
-  position: fixed;
-  width: 100%;
-  top: 0;
-  h1 { padding-bottom: 15px; }
-  &.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 {
@@ -67,6 +72,8 @@ nav.primary {
 }
 
 nav.secondary {
+  border-bottom: 1px solid #eee;
+
   .user-menu {
     display: block;
     width: 100%;
@@ -84,42 +91,29 @@ nav.secondary {
 #compact-secondary-nav {
   display: none;
 }
+
 .compact-hide {
   display: inline-block;
 }
 
-#content { margin-top: 58px; }
-
 .map-layout {
-  #sidebar {
-    width: 100%;
-    position: fixed;
-    top: 58px;
-    height: 240px;
+  #sidebar, #map {
+    position: relative;
     overflow-x: hidden;
-    z-index: 1;
-    background: #fff;
-    p.large-text {
-      font-size: 1.2em;
-      line-height: 1.4em;
+    width: 100%;
+    height: 50%;
+  }
+
+  .overlay-sidebar {
+    #sidebar {
+      width: 300px;
     }
-    &.minimized {
-      background: none;
+
+    #map {
+      height: 100%;
     }
   }
-  #content {
-    position: fixed;
-    top: 0;
-    display: block;
-    height: 100%;
-    margin-top: 0;
-    padding-top: 58px;
-  }
-  #map {
-    width: 100%;
-    // height: 100%;
-    // position: fixed;
-  }
+
   #map-ui {
     z-index: 9999;
     width: 100%;
@@ -127,6 +121,10 @@ nav.secondary {
   }
 }
 
+#sidebar .welcome {
+  display: none !important;
+}
+
 .leaflet-top.leaflet-right {
   top: 10px !important;
   z-index: 0;