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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1dcdb3b2660962d7071129fc7188172e49bc3dcb..c3f2b36adc361a320f7618664c5d39644cb75c36 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;
   }
 
@@ -632,11 +632,6 @@ tr.turn {
     }
   }
 
-  .note-description {
-    overflow: hidden;
-    margin: 0 0 10px 10px;
-  }
-
   .query-results {
     display: none;
   }