From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Jul 2020 20:31:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2711'
X-Git-Tag: live~3028
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8a013c0a9647e7deed7dfbccf9a679d008f8d252?hp=-c

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

8a013c0a9647e7deed7dfbccf9a679d008f8d252
diff --combined app/assets/stylesheets/common.scss
index 7c4053c4f,0890481da..50bcf9be7
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -35,6 -35,10 +35,6 @@@ small, aside 
    margin-right: $lineheight/4;
  }
  
 -.red { color: $red; }
 -
 -.piwik { border: 0; }
 -
  [dir=rtl] { /* no-r2 */ text-align: right; }
  
  [dir=ltr] { /* no-r2 */ text-align: left; }
@@@ -76,6 -80,7 +76,6 @@@
  a {
    color: #24d;
    text-decoration: none;
 -  -webkit-appearance: none;
    outline: 0;
    &:hover {
      text-decoration: underline;
@@@ -266,7 -271,7 +266,7 @@@ nav.primary, nav.secondary 
    display: none;
  }
  
 -body.compact {
 +body.compact-nav {
    #compact-secondary-nav {
      display: inline-block;
    }
@@@ -694,10 -699,6 +694,6 @@@
  }
  
  #browse_status {
-   p {
-     padding: $lineheight;
-   }
- 
    input {
      display: block;
      margin-left: auto;
@@@ -1039,11 -1040,6 +1035,6 @@@ tr.turn:hover 
      }
    }
  
-   .warning {
-     margin: 0 0 $lineheight/2 0;
-     padding: 0 $lineheight/2;
-   }
- 
    .note-comments li, .changeset-comments li {
      margin: $lineheight/2 0;
  
@@@ -1506,6 -1502,13 +1497,6 @@@
  
  /* Rules for the account settings page */
  
 -#accountForm .user_map {
 -  position: relative;
 -  width: 500px;
 -  height: 400px;
 -  border: 1px solid $grey;
 -}
 -
  #accountForm .user_image {
    margin-bottom: 0;
  }
@@@ -2206,18 -2209,12 +2197,18 @@@ input.richtext_title[type="text"] 
        display: block;
        color: white;
        font-weight: 300;
 -      font-size: 34px;
 +      font-size: 28px;
        span {
          color: $vibrant-green;
        }
      }
  
 +    @include media-breakpoint-up(sm) {
 +      h1 {
 +        font-size: 34px;
 +      }
 +    }
 +
      .user-image {
        position: absolute;
        top: 0px;
@@@ -2293,3 -2290,8 +2284,3 @@@
      display: none;
    }
  }
 -
 -.read-reports {
 -  background: $lightgrey;
 -  opacity: 0.7;
 -}