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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 0edb3b0fc3cdbb56741946ac3e6da9302f883595..cf0bfae22527b41685c3ef8cd7524fef739673fd 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;
   }