Merge branch 'master' into redesign

[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 182272e780da3db10c05f4237d80a02847e36ed0..39b946af06d93c96eacf54d691bb6fbb02c54c27 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 {
@@ -32,8 +35,13 @@ header {
   &.closed nav {
     display: none;
   }
+
+  .search_form {
+    display: block;
+  }
 }
 
+#sidebar .search_form,
 #edit_tab,
 #export_tab {
   display: none;