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

diff --combined app/assets/stylesheets/common.scss
index c3b7dca67fcd48a74b4d295990c1a55e2fe32b4f,59f81353dcf156a612597462e63ab4b5d69c9f80..454c21cc8386996aa8d591ed4e827cb5ef9a07ac
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -5,11 -5,10 +5,10 @@@
  
  /* Minimal CSS reset */
  
- html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input {
+ html, body, ul, ol, li, form, fieldset, legend, input {
    margin: 0;
    padding: 0;
    border: 0;
-   font-size:100%;
  }
  
  fieldset,img { border: 0; }
@@@ -542,8 -541,6 +541,6 @@@ body.compact 
    #sidebar {
      float: left;
      width: $sidebarWidth;
-     background: #fff;
-     font-size: 12px;
  
      #sidebar_loader {
        display: none;
@@@ -558,12 -555,13 +555,13 @@@
  
      h2 {
        padding: $lineheight $lineheight $lineheight/2;
+       font-size: 1.5rem;
      }
  
      h3, h4 {
        margin-top: $lineheight;
        margin-bottom: $lineheight/2;
-       font-size: 13px;
+       font-size: 1.25rem;
      }
  
      .close-wrap {
@@@ -1384,8 -1382,6 +1382,6 @@@ tr.turn:hover 
  
  .content-heading {
    background: $lightgrey;
- 
-   h1 { font-size: 22px; }
  }
  
  .content-body {
@@@ -1682,7 -1678,6 +1678,6 @@@
      h2 {
        margin-top: 0;
        margin-bottom: $lineheight/2;
-       font-size: 24px;
      }
    }
  
@@@ -2083,7 -2078,6 +2078,7 @@@ textarea 
    color: #222;
    background-color: #fff;
    border: 1px solid $grey;
 +  border-radius: 3px;
    padding: 2px 5px;
    margin: 0;
    width: 200px;
@@@ -2096,8 -2090,6 +2091,8 @@@
  textarea {
    padding: 5px;
    width: 100%;
 +  min-height: 50px;
 +  resize: vertical;
  }
  
  /* Rules for user images */
@@@ -2314,18 -2306,6 +2309,6 @@@ a.button 
      margin-bottom: $lineheight/2;
    }
  
-   h1 {
-     font-size: 24px;
-   }
- 
-   h2 {
-     font-size: 18px;
-   }
- 
-   h3 {
-     font-size: $typeheight;
-   }
- 
    code {
      font-size: 13px;
      background: $lightgrey;