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

diff --combined app/assets/stylesheets/_bootstrap-custom.scss
index c07fc2d07e47080dc140aac6ed4d3cffc1afd339,689d7ee985660c8b410bc82261129cbf672a2d5c..e502f7db6fdcd1e9d0c832c5385df6222997901e
--- 1/app/assets/stylesheets/_bootstrap-custom.scss
--- 2/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@@ -13,7 -13,7 +13,7 @@@
  @import "bootstrap/type";
  // @import "bootstrap/images";
  // @import "bootstrap/code";
- // @import "bootstrap/grid";
+ @import "bootstrap/grid";
  // @import "bootstrap/tables";
  // @import "bootstrap/forms";
  // @import "bootstrap/buttons";
@@@ -32,7 -32,7 +32,7 @@@
  @import "bootstrap/alert";
  // @import "bootstrap/progress";
  // @import "bootstrap/media";
 -// @import "bootstrap/list-group";
 +@import "bootstrap/list-group";
  // @import "bootstrap/close";
  // @import "bootstrap/toasts";
  // @import "bootstrap/modal";

diff --combined app/assets/stylesheets/common.scss
index f85a946161566b6cb6d01d55b23f63ed92fb551f,13576af4e83cdb4dc8dcb50999d8082628b7f7ff..229db3ba3d0bbb067a1c75deb56eb2318d83bd27
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -58,36 -58,6 +58,6 @@@ strong 
      clear: both;
  }
  
- /* Basic grid */
- 
- .col0    { float:left; width:04.1666%; }
- .col1    { float:left; width:08.3333%; }
- .col2    { float:left; width:16.6666%; }
- .col3    { float:left; width:25.0000%; }
- .col4    { float:left; width:33.3333%; }
- .col5    { float:left; width:41.6666%; }
- .col6    { float:left; width:50.0000%; }
- .col7    { float:left; width:58.3333%; }
- .col8    { float:left; width:66.6666%; }
- .col9    { float:left; width:75.0000%; }
- .col10   { float:left; width:83.3333%; }
- .col11   { float:left; width:91.6666%; }
- .col12   { width:100%; }
- 
- .margin0  { margin-left:04.1666%; }
- .margin1  { margin-left:08.3333%; }
- .margin2  { margin-left:16.6666%; }
- .margin3  { margin-left:25.0000%; }
- .margin4  { margin-left:33.3333%; }
- .margin5  { margin-left:41.6666%; }
- .margin6  { margin-left:50.0000%; }
- .margin7  { margin-left:58.3333%; }
- .margin8  { margin-left:66.6666%; }
- .margin9  { margin-left:75.0000%; }
- .margin10 { margin-left:83.3333%; }
- .margin11 { margin-left:91.6666%; }
- .margin12 { margin-left:100.0000%; }
- 
  .fillL { background-color: white; }
  
  /* Default rules for the body of every page */
@@@ -1108,12 -1078,21 +1078,12 @@@ tr.turn:hover 
  
  #sidebar .changesets {
    li {
 -    padding: 15px 20px;
 -    border-bottom: 1px solid $grey;
      cursor: pointer;
  
      &.selected { background: $list-highlight; }
      /* color is derived from changeset bbox fillColor in history.js */
    }
  
 -  h4 {
 -    margin: 0;
 -    a {
 -      color: #000;
 -    }
 -  }
 -
    .comments {
      float: right;
      color: $darkgrey;
@@@ -1182,6 -1161,7 +1152,6 @@@
      background-color: #F6F6F6;
      border: 1px solid $grey;
      border-radius: 3px;
 -    font-size: 12px;
      table-layout: fixed;
      border-collapse: separate;
  
@@@ -1213,8 -1193,8 +1183,8 @@@
  
      .colour-preview-box {
        float: right;
 -      width: 12px;
 -      height: 12px;
 +      width: 14px;
 +      height: 14px;
        margin: 4px 0px;
        border: 1px solid rgba(0, 0, 0, .1);
        // add color via inline css on element: background-color: <tag value>;
@@@ -1267,14 -1247,17 +1237,14 @@@
  
    .query-results {
      display: none;
 +    padding-bottom: $lineheight/2;
  
      h3 {
 -      padding: $lineheight $lineheight $lineheight/2;
 -      margin: 0;
 +      padding: 0 $lineheight;
      }
  
      ul {
        li {
 -        padding: 15px 20px;
 -        border-bottom: 1px solid $grey;
 -
          &.query-result {
            cursor: pointer;
          }
@@@ -1391,19 -1374,6 +1361,6 @@@
  
  /* Overrides for pages that use new layout conventions */
  
- .users-new,
- .users-create,
- .users-terms {
-   .content-body .content-inner {
-     padding: 0;
- 
-     .message {
-       margin-top: 80px;
-       padding: 20px;
-     }
-   }
- }
- 
  .users-new,
  .users-create,
  .users-terms,
@@@ -2081,6 -2051,13 +2038,6 @@@ abbr.geo 
    border-bottom: none;
  }
  
 -/* Rules for RSS buttons */
 -
 -.rsssmall {
 -  position: relative;
 -  top: 3px;
 -}
 -
  /* General styles for action lists / subnavs / pager navs */
  
  ul.secondary-actions {
@@@ -2607,11 -2584,6 +2564,6 @@@ input.richtext_title[type="text"] 
      text-decoration: none;
    }
  
-   .note-box {
-     margin-top: 20px;
-     background-color: $offwhite;
-   }
- 
    .icon.note {
      background-color: #333;
      border-radius: 4px;