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 5e8edc28c78988ce4856172e080af8a86d3397ac..950e1214d5ff6a1b3d0b600a8326c534da139114 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -1,3 +1,5 @@
+@import "parameters";
+
 /* Styles specific to a small screen, such as iPhone, Android, etc... */
 
 input[type="submit"],
@@ -23,6 +25,7 @@ nav.secondary {
 
 header {
   height: auto;
+  min-height: $headerHeight;
   background: #fff;
 
   h1 {
@@ -33,12 +36,12 @@ header {
     display: none;
   }
 
-  .search_form {
+  .search_forms {
     display: block;
   }
 }
 
-#sidebar .search_form,
+#sidebar .search_forms,
 #edit_tab,
 #export_tab {
   display: none;
@@ -119,7 +122,7 @@ nav.secondary {
 }
 
 #sidebar .welcome {
-  display: none;
+  display: none !important;
 }
 
 .leaflet-top.leaflet-right {