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

diff --combined app/assets/stylesheets/common.scss
index 8f9e7d018566c8d5453ed683c9daa7f54ae3ce9d,1dcdb3b2660962d7071129fc7188172e49bc3dcb..c3f2b36adc361a320f7618664c5d39644cb75c36
--- 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;
    }
  
@@@ -423,10 -423,6 +423,6 @@@ body.small-nav 
    }
  
    .overlay-layers {
-     p {
-       font-size: 13px;
-       margin-bottom: 8px;
-     }
      li.disabled { color: $darkgrey; }
    }
  }
@@@ -636,6 -632,11 +632,6 @@@ tr.turn 
      }
    }
  
 -  .note-description {
 -    overflow: hidden;
 -    margin: 0 0 10px 10px;
 -  }
 -
    .query-results {
      display: none;
    }