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

diff --combined app/assets/stylesheets/common.scss
index cf0bfae22527b41685c3ef8cd7524fef739673fd,24316fec03ea22544839b7f589f3fbb682370680..8f9e7d018566c8d5453ed683c9daa7f54ae3ce9d
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -103,11 -103,11 +103,11 @@@ header 
    }
  
    > * {
 -    height: 100%;
      padding: $lineheight * 0.5;
    }
  
    h1 {
 +    height: $headerHeight;
      font-size: 18px;
    }
  
@@@ -636,11 -636,6 +636,6 @@@ tr.turn 
      }
    }
  
-   .note-description {
-     overflow: hidden;
-     margin: 0 0 10px 10px;
-   }
- 
    .query-results {
      display: none;
    }