From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Dec 2019 21:40:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2471'
X-Git-Tag: live~2459
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1c5642637a87ab250d2a1204cc83a578e7aa29f1?hp=-c

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

1c5642637a87ab250d2a1204cc83a578e7aa29f1
diff --combined app/assets/stylesheets/_bootstrap-custom.scss
index 6bbaecbe4,1c3629aa8..96d37415f
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@@ -27,9 -27,9 +27,9 @@@
  @import "bootstrap/card";
  // @import "bootstrap/breadcrumb";
  // @import "bootstrap/pagination";
 -// @import "bootstrap/badge";
 +@import "bootstrap/badge";
  // @import "bootstrap/jumbotron";
- // @import "bootstrap/alert";
+ @import "bootstrap/alert";
  // @import "bootstrap/progress";
  // @import "bootstrap/media";
  // @import "bootstrap/list-group";
diff --combined app/assets/stylesheets/common.scss
index 1e9b3b531,afe5324b2..1c8fe2951
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -5,10 -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; }
@@@ -541,6 -542,8 +541,6 @@@ body.compact 
    #sidebar {
      float: left;
      width: $sidebarWidth;
 -    background: #fff;
 -    font-size: 12px;
  
      #sidebar_loader {
        display: none;
@@@ -555,13 -558,12 +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 {
@@@ -1382,6 -1384,8 +1382,6 @@@ tr.turn:hover 
  
  .content-heading {
    background: $lightgrey;
 -
 -  h1 { font-size: 22px; }
  }
  
  .content-body {
@@@ -1483,6 -1487,7 +1483,6 @@@
  /* Rules for the trace list shown by the traces tab etc */
  
  #trace_list {
 -  font-size: $lineheight/2;
    border-width: 0px;
    text-align: right;
  
@@@ -1490,6 -1495,38 +1490,6 @@@
      font-size: 12px;
      color: gray;
    }
 -
 -  .trace_pending {
 -    color: red;
 -  }
 -
 -  .trace_public {
 -    color: green;
 -  }
 -
 -  .trace_identifiable {
 -    color: green;
 -  }
 -
 -  .trace_trackable {
 -    color: red;
 -  }
 -
 -  .trace_private {
 -    color: red;
 -  }
 -}
 -
 -/* Rules for the trace view */
 -
 -.trace-show {
 -  .trace_pending {
 -    color: red;
 -  }
 -
 -  .geo {
 -    display: inline;
 -  }
  }
  
  /* Rules for the new trace form */
@@@ -1605,6 -1642,7 +1605,6 @@@
  /* Rules for the user list */
  
  #user_list {
 -  font-size: $lineheight/2;
    width: 100%;
  
    tr {
@@@ -1644,6 -1682,7 +1644,6 @@@
      h2 {
        margin-top: 0;
        margin-bottom: $lineheight/2;
 -      font-size: 24px;
      }
    }
  
@@@ -2044,7 -2083,6 +2044,7 @@@ textarea 
    color: #222;
    background-color: #fff;
    border: 1px solid $grey;
 +  border-radius: 3px;
    padding: 2px 5px;
    margin: 0;
    width: 200px;
@@@ -2057,8 -2095,6 +2057,8 @@@
  textarea {
    padding: 5px;
    width: 100%;
 +  min-height: 50px;
 +  resize: vertical;
  }
  
  /* Rules for user images */
@@@ -2275,6 -2311,18 +2275,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;
@@@ -2842,12 -2890,6 +2842,6 @@@ input.richtext_title[type="text"] 
  }
  
  .report-disclaimer {
-   background: #fff1f0;
-   color: #d85030;
-   border-color: rgba(216, 80, 48, 0.3);
-   padding: 10px 20px;
-   margin-bottom: $lineheight;
- 
    ul {
      padding-left: $lineheight;
      margin-bottom: 0;