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

diff --combined app/assets/stylesheets/common.scss
index 454c21cc8386996aa8d591ed4e827cb5ef9a07ac,5abd817f85436f7a0515282084a0027de86722cf..1e9b3b531506720629ac532ae85578ee186a619d
--- 1/app/assets/stylesheets/common.scss
--- 2/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,7 -1487,6 +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;
  
@@@ -1491,38 -1494,6 +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 */
@@@ -1638,7 -1609,6 +1605,6 @@@
  /* Rules for the user list */
  
  #user_list {
-   font-size: $lineheight/2;
    width: 100%;
  
    tr {
@@@ -1678,6 -1648,7 +1644,6 @@@
      h2 {
        margin-top: 0;
        margin-bottom: $lineheight/2;
 -      font-size: 24px;
      }
    }
  
@@@ -2078,7 -2049,6 +2044,7 @@@ textarea 
    color: #222;
    background-color: #fff;
    border: 1px solid $grey;
 +  border-radius: 3px;
    padding: 2px 5px;
    margin: 0;
    width: 200px;
@@@ -2091,8 -2061,6 +2057,8 @@@
  textarea {
    padding: 5px;
    width: 100%;
 +  min-height: 50px;
 +  resize: vertical;
  }
  
  /* Rules for user images */
@@@ -2309,6 -2277,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;