Merge remote-tracking branch 'upstream/pull/4833'

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 24316fec03ea22544839b7f589f3fbb682370680..8f9e7d018566c8d5453ed683c9daa7f54ae3ce9d 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -103,11 +103,11 @@ header {
   }
 
   > * {
-    height: 100%;
     padding: $lineheight * 0.5;
   }
 
   h1 {
+    height: $headerHeight;
     font-size: 18px;
   }