From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Dec 2019 21:29:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2469'
X-Git-Tag: live~3598
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5ff4e4e331e8e8e117bbbfeefe045c66d1349d29?hp=dcd55590709ab18657cdbe5ab4ddd5e360ba6b43

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c3b7dca67..454c21cc8 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -5,11 +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 @@ body.compact {
   #sidebar {
     float: left;
     width: $sidebarWidth;
-    background: #fff;
-    font-size: 12px;
 
     #sidebar_loader {
       display: none;
@@ -558,12 +555,13 @@ body.compact {
 
     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 @@ tr.turn:hover {
 
 .content-heading {
   background: $lightgrey;
-
-  h1 { font-size: 22px; }
 }
 
 .content-body {
@@ -1682,7 +1678,6 @@ tr.turn:hover {
     h2 {
       margin-top: 0;
       margin-bottom: $lineheight/2;
-      font-size: 24px;
     }
   }
 
@@ -2314,18 +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;