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

diff --combined Gemfile
index 983bf9f92464a1628c84c67e3302774c4697716a,d7739491172f55d499e652c2bc6941bde9f62bf8..466d733235ab4b8d59e59837ad2f3e608199dd60
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -1,7 -1,7 +1,7 @@@
  source "https://rubygems.org"
  
  # Require rails
 -gem "rails", "6.0.1"
 +gem "rails", "6.0.2"
  
  # Require things which have moved to gems in ruby 1.9
  gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@@ -40,9 -40,9 +40,10 @@@ gem "autoprefixer-rails
  gem "image_optim_rails"
  
  # Load rails plugins
 +gem "actionpack-page_caching", ">= 1.2.0"
  gem "active_record_union"
  gem "activerecord-import"
+ gem "bootstrap", "~> 4.3.1"
  gem "cancancan"
  gem "composite_primary_keys", "~> 12.0.0"
  gem "config"
@@@ -51,6 -51,7 +52,6 @@@ gem "dynamic_form
  gem "http_accept_language", "~> 2.0.0"
  gem "i18n-js", ">= 3.0.0"
  gem "oauth-plugin", ">= 0.5.1"
 -gem "openstreetmap-actionpack-page_caching", ">= 1.1.2", :require => "actionpack/page_caching"
  gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
  gem "rack-cors"
  gem "rails-i18n", "~> 4.0.0"

diff --combined Gemfile.lock
index 0c1707be319888be12f6d3f94a9a1a0ea7d52bc0,5af33d9a18ed98d05f94725d75e6e6268c58ae80..cc2d7deafde8f9b4e990cc519a6d0c83efa292c2
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -4,62 -4,60 +4,62 @@@ GE
      SystemTimer (1.2.3)
      aasm (5.0.6)
        concurrent-ruby (~> 1.0)
 -    actioncable (6.0.1)
 -      actionpack (= 6.0.1)
 +    actioncable (6.0.2)
 +      actionpack (= 6.0.2)
        nio4r (~> 2.0)
        websocket-driver (>= 0.6.1)
 -    actionmailbox (6.0.1)
 -      actionpack (= 6.0.1)
 -      activejob (= 6.0.1)
 -      activerecord (= 6.0.1)
 -      activestorage (= 6.0.1)
 -      activesupport (= 6.0.1)
 +    actionmailbox (6.0.2)
 +      actionpack (= 6.0.2)
 +      activejob (= 6.0.2)
 +      activerecord (= 6.0.2)
 +      activestorage (= 6.0.2)
 +      activesupport (= 6.0.2)
        mail (>= 2.7.1)
 -    actionmailer (6.0.1)
 -      actionpack (= 6.0.1)
 -      actionview (= 6.0.1)
 -      activejob (= 6.0.1)
 +    actionmailer (6.0.2)
 +      actionpack (= 6.0.2)
 +      actionview (= 6.0.2)
 +      activejob (= 6.0.2)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
 -    actionpack (6.0.1)
 -      actionview (= 6.0.1)
 -      activesupport (= 6.0.1)
 +    actionpack (6.0.2)
 +      actionview (= 6.0.2)
 +      activesupport (= 6.0.2)
        rack (~> 2.0)
        rack-test (>= 0.6.3)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.2.0)
 -    actiontext (6.0.1)
 -      actionpack (= 6.0.1)
 -      activerecord (= 6.0.1)
 -      activestorage (= 6.0.1)
 -      activesupport (= 6.0.1)
 +    actionpack-page_caching (1.2.0)
 +      actionpack (>= 5.0.0)
 +    actiontext (6.0.2)
 +      actionpack (= 6.0.2)
 +      activerecord (= 6.0.2)
 +      activestorage (= 6.0.2)
 +      activesupport (= 6.0.2)
        nokogiri (>= 1.8.5)
 -    actionview (6.0.1)
 -      activesupport (= 6.0.1)
 +    actionview (6.0.2)
 +      activesupport (= 6.0.2)
        builder (~> 3.1)
        erubi (~> 1.4)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.1, >= 1.2.0)
      active_record_union (1.3.0)
        activerecord (>= 4.0)
 -    activejob (6.0.1)
 -      activesupport (= 6.0.1)
 +    activejob (6.0.2)
 +      activesupport (= 6.0.2)
        globalid (>= 0.3.6)
 -    activemodel (6.0.1)
 -      activesupport (= 6.0.1)
 -    activerecord (6.0.1)
 -      activemodel (= 6.0.1)
 -      activesupport (= 6.0.1)
 +    activemodel (6.0.2)
 +      activesupport (= 6.0.2)
 +    activerecord (6.0.2)
 +      activemodel (= 6.0.2)
 +      activesupport (= 6.0.2)
      activerecord-import (1.0.3)
        activerecord (>= 3.2)
 -    activestorage (6.0.1)
 -      actionpack (= 6.0.1)
 -      activejob (= 6.0.1)
 -      activerecord (= 6.0.1)
 +    activestorage (6.0.2)
 +      actionpack (= 6.0.2)
 +      activejob (= 6.0.2)
 +      activerecord (= 6.0.2)
        marcel (~> 0.3.1)
 -    activesupport (6.0.1)
 +    activesupport (6.0.2)
        concurrent-ruby (~> 1.0, >= 1.0.2)
        i18n (>= 0.7, < 2)
        minitest (~> 5.1)
@@@ -74,13 -72,13 +74,13 @@@
      autoprefixer-rails (9.7.3)
        execjs
      aws-eventstream (1.0.3)
 -    aws-partitions (1.251.0)
 -    aws-sdk-core (3.84.0)
 +    aws-partitions (1.254.0)
 +    aws-sdk-core (3.85.1)
        aws-eventstream (~> 1.0, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
        jmespath (~> 1.0)
 -    aws-sdk-kms (1.26.0)
 +    aws-sdk-kms (1.27.0)
        aws-sdk-core (~> 3, >= 3.71.0)
        aws-sigv4 (~> 1.1)
      aws-sdk-s3 (1.59.0)
@@@ -106,8 -104,12 +106,12 @@@
        debug_inspector (>= 0.0.1)
      bootsnap (1.4.5)
        msgpack (~> 1.0)
+     bootstrap (4.3.1)
+       autoprefixer-rails (>= 9.1.0)
+       popper_js (>= 1.14.3, < 2)
+       sassc-rails (>= 2.0.0)
      browser (2.7.1)
 -    builder (3.2.3)
 +    builder (3.2.4)
      bzip2-ffi (1.0.0)
        ffi (~> 1.0)
      cancancan (3.0.1)
@@@ -236,7 -238,7 +240,7 @@@
        rails-dom-testing (>= 1, < 3)
        railties (>= 4.2.0)
        thor (>= 0.14, < 2.0)
 -    json (2.2.0)
 +    json (2.3.0)
      jwt (2.2.1)
      kgio (2.11.2)
      kramdown (2.1.0)
@@@ -310,6 -312,8 +314,6 @@@
      omniauth-windowslive (0.0.12)
        multi_json (~> 1.12)
        omniauth-oauth2 (~> 1.4)
 -    openstreetmap-actionpack-page_caching (1.1.2)
 -      actionpack (>= 5.0.0)
      openstreetmap-deadlock_retry (1.3.0)
      parallel (1.19.1)
      parser (2.6.5.0)
@@@ -319,6 -323,7 +323,7 @@@
        capybara (>= 2.1, < 4)
        cliver (~> 0.3.1)
        websocket-driver (>= 0.2.0)
+     popper_js (1.14.5)
      progress (3.5.2)
      psych (3.1.0)
      public_suffix (4.0.1)
@@@ -334,20 -339,20 +339,20 @@@
      rack-test (1.1.0)
        rack (>= 1.0, < 3)
      rack-uri_sanitizer (0.0.2)
 -    rails (6.0.1)
 -      actioncable (= 6.0.1)
 -      actionmailbox (= 6.0.1)
 -      actionmailer (= 6.0.1)
 -      actionpack (= 6.0.1)
 -      actiontext (= 6.0.1)
 -      actionview (= 6.0.1)
 -      activejob (= 6.0.1)
 -      activemodel (= 6.0.1)
 -      activerecord (= 6.0.1)
 -      activestorage (= 6.0.1)
 -      activesupport (= 6.0.1)
 +    rails (6.0.2)
 +      actioncable (= 6.0.2)
 +      actionmailbox (= 6.0.2)
 +      actionmailer (= 6.0.2)
 +      actionpack (= 6.0.2)
 +      actiontext (= 6.0.2)
 +      actionview (= 6.0.2)
 +      activejob (= 6.0.2)
 +      activemodel (= 6.0.2)
 +      activerecord (= 6.0.2)
 +      activestorage (= 6.0.2)
 +      activesupport (= 6.0.2)
        bundler (>= 1.3.0)
 -      railties (= 6.0.1)
 +      railties (= 6.0.2)
        sprockets-rails (>= 2.0.0)
      rails-controller-testing (1.0.4)
        actionpack (>= 5.0.1.x)
@@@ -361,9 -366,9 +366,9 @@@
      rails-i18n (4.0.2)
        i18n (~> 0.6)
        rails (>= 4.0)
 -    railties (6.0.1)
 -      actionpack (= 6.0.1)
 -      activesupport (= 6.0.1)
 +    railties (6.0.2)
 +      actionpack (= 6.0.2)
 +      activesupport (= 6.0.2)
        method_source
        rake (>= 0.8.7)
        thor (>= 0.20.3, < 2.0)
@@@ -456,7 -461,6 +461,7 @@@ PLATFORM
  DEPENDENCIES
    SystemTimer (>= 1.1.3)
    aasm
 +  actionpack-page_caching (>= 1.2.0)
    active_record_union
    activerecord-import
    annotate
@@@ -466,6 -470,7 +471,7 @@@
    bigdecimal (~> 1.1.0)
    binding_of_caller
    bootsnap (>= 1.4.2)
+   bootstrap (~> 4.3.1)
    browser
    bzip2-ffi
    cancancan
@@@ -507,6 -512,7 +513,6 @@@
    omniauth-mediawiki (>= 0.0.4)
    omniauth-openid
    omniauth-windowslive
 -  openstreetmap-actionpack-page_caching (>= 1.1.2)
    openstreetmap-deadlock_retry (>= 1.3.0)
    pg
    poltergeist
@@@ -516,7 -522,7 +522,7 @@@
    r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer
 -  rails (= 6.0.1)
 +  rails (= 6.0.2)
    rails-controller-testing
    rails-i18n (~> 4.0.0)
    rinku (>= 2.0.6)

diff --combined app/assets/stylesheets/common.scss
index 54fd52dd2f4c2bb6d9092796033e7cac55305678,6031526f4be0f2e3a474f7fe2429e215034c1a42..6e73da63b31d0df9b7e7b6e18b0bee2d51948767
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1,4 -1,5 +1,5 @@@
  @import "parameters";
+ @import "bootstrap-custom";
  
  /* Styles common to large and small screens */
  
@@@ -108,23 -109,6 +109,6 @@@ body 
    height: 100%;
  }
  
- h1, h2, h3 {
-   font-weight: 600;
-   line-height: 1.2;
- }
- 
- h4, h5 {
-   font-weight: 500;
- }
- 
- h1 {
-   font-size: 18px;
- }
- 
- h2, h3 {
-   font-size: 16px;
- }
- 
  p > img {
    width: auto;
    max-width: 100%;
@@@ -202,8 -186,8 +186,8 @@@ a 
  
  hr {
    border: none;
 -  background-color: #ccc;
 -  color: #ccc;
 +  background-color: $grey;
 +  color: $grey;
    height: 1px;
  }
  
@@@ -229,7 -213,7 +213,7 @@@ table 
  /* Utility for de-emphasizing content */
  
  .deemphasize {
 -  color: #999;
 +  color: $darkgrey;
    a {
      color: $blue;
    }
@@@ -280,12 -264,19 +264,19 @@@ header 
    }
  
    h1 {
+     font-size: 18px;
+     font-weight: 600;
+     line-height: 1.2;
      margin: 0;
      padding-top: 15px;
  
      a {
        color: #000;
      }
+ 
+     a:hover {
+       color: #000;
+     }
    }
  }
  
@@@ -330,11 -321,11 +321,11 @@@ nav.primary 
    }
  
    .disabled a {
 -    color: #ccc;
 +    color: $grey;
      cursor: default;
  
      .caret {
 -      border-top-color: #ccc;
 +      border-top-color: $grey;
      }
    }
  
@@@ -505,7 -496,7 +496,7 @@@ body.compact 
    }
  
    &.active {
 -    background-color: #9ed485;
 +    background-color: $vibrant-green;
    }
  
    .icon {
@@@ -692,7 -683,7 +683,7 @@@
      overflow: auto;
  
      .section {
 -      border-bottom: 1px solid #DDD;
 +      border-bottom: 1px solid $grey;
        padding: 10px 20px;
      }
  
@@@ -702,14 -693,14 +693,14 @@@
        font-size:20px;
        line-height:10px;
        color:#222;
 -      border:1px solid #ddd;
 +      border:1px solid $grey;
      }
  
      .tooltip {
        opacity: 1;
 -      border: 1px solid #ccc;
 +      border: 1px solid $grey;
        .tooltip-arrow {
 -        border-top-color: #ccc;
 +        border-top-color: $grey;
        }
      }
    }
@@@ -768,7 -759,7 +759,7 @@@
        font-size: 13px;
        margin-bottom: 8px;
      }
 -    li.disabled { color: #999; }
 +    li.disabled { color: $darkgrey; }
    }
  }
  
@@@ -872,7 -863,7 +863,7 @@@
    position: relative;
    padding: $lineheight/2 $lineheight;
    // background: $offwhite;
 -  // border-bottom: 1px solid #ccc;
 +  // border-bottom: 1px solid $grey;
    > .close {
      float: right;
      margin-top: 2px;
@@@ -939,7 -930,7 +930,7 @@@ header .search_forms
  
    input:focus {
      outline: none;
 -    box-shadow: 0px 0px 7px #9ED485;
 +    box-shadow: 0px 0px 7px $vibrant-green;
    }
  
    input[type=submit].float {
@@@ -1085,10 -1076,10 +1076,10 @@@ p#routing_summary 
  td.instruction, td.distance {
      padding-top: $lineheight/5;
      padding-bottom: $lineheight/5;
 -    border-bottom: 1px solid #DDD;
 +    border-bottom: 1px solid $grey;
  }
  td.distance {
 -    color: #BBB;
 +    color: $darkgrey;
      text-align: right;
      font-size: x-small;
  }
@@@ -1119,7 -1110,7 +1110,7 @@@ tr.turn:hover 
  #sidebar .changesets {
    li {
      padding: 15px 20px;
 -    border-bottom: 1px solid #ddd;
 +    border-bottom: 1px solid $grey;
      cursor: pointer;
  
      &.selected { background: $list-highlight; }
@@@ -1135,7 -1126,7 +1126,7 @@@
  
    .comments {
      float: right;
 -    color: #999;
 +    color: $darkgrey;
    }
  
    .comments-0 {
@@@ -1153,7 -1144,7 +1144,7 @@@
  #sidebar_content {
    .browse-section {
      padding: $lineheight/2 $lineheight;
 -    border-bottom: 1px solid #ddd;
 +    border-bottom: 1px solid $grey;
  
      h4:first-child {
        margin-top: 0;
@@@ -1168,7 -1159,7 +1159,7 @@@
    .paginate {
      float: right;
      padding: 1px 6px;
 -    border: 1px solid #eee;
 +    border: 1px solid $lightgrey;
      border-radius: 3px;
    }
  
@@@ -1182,7 -1173,7 +1173,7 @@@
      h4 {
        padding: 5px 0 5px 10px;
        font-size: 12px;
 -      border: 1px solid #CCC;
 +      border: 1px solid $grey;
        border-radius: 4px 4px 0 0;
        background-color: #F6F6F6;
      }
@@@ -1191,7 -1182,7 +1182,7 @@@
        padding: 7px 10px;
        font-size: 12px;
        background-color: #FFF;
 -      border: 1px solid #CCC;
 +      border: 1px solid $grey;
        border-top: 0;
        border-radius: 0 0 4px 4px;
      }
@@@ -1199,14 -1190,14 +1190,14 @@@
  
    .browse-tag-list {
      background-color: #F6F6F6;
 -    border: 1px solid #ddd;
 +    border: 1px solid $grey;
      border-radius: 3px;
      font-size: 12px;
      table-layout: fixed;
      border-collapse: separate;
  
      th, td {
 -      border-bottom: 1px solid #ddd;
 +      border-bottom: 1px solid $grey;
      }
  
      tr:last-child th, tr:last-child td {
@@@ -1227,7 -1218,7 +1218,7 @@@
      }
  
      .browse-tag-v {
 -      border-left: 1px solid #ddd;
 +      border-left: 1px solid $grey;
        background-color: #fff;
      }
  
@@@ -1296,7 -1287,7 +1287,7 @@@
      ul {
        li {
          padding: 15px 20px;
 -        border-bottom: 1px solid #ddd;
 +        border-bottom: 1px solid $grey;
  
          &.query-result {
            cursor: pointer;
@@@ -1330,8 -1321,8 +1321,8 @@@
    }
  
    .export_boxy {
 -    background: #eee;
 -    border: 1px solid #ccc;
 +    background: $lightgrey;
 +    border: 1px solid $grey;
      border-radius: 3px;
  
      #maxlat { margin-top: -1px; }
@@@ -1488,7 -1479,7 +1479,7 @@@
    position: relative;
    width: 45%;
    height: 400px;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
    margin-bottom: $lineheight;
    float: right;
  }
@@@ -1590,7 -1581,7 +1581,7 @@@
  
  .activity-block {
    clear: left;
 -  border-bottom: 1px solid #ccc;
 +  border-bottom: 1px solid $grey;
    padding-bottom: $lineheight;
    float: left;
    h3 {
@@@ -1675,7 -1666,7 +1666,7 @@@
    position: relative;
    padding-top: $lineheight;
    padding-bottom: $lineheight/2;
 -  border-top: 1px solid #ccc;
 +  border-top: 1px solid $grey;
  
    &:first-of-type {
      margin-top: $lineheight/2;
@@@ -1716,12 -1707,12 +1707,12 @@@
      position: relative;
      width: 90%;
      height: 400px;
 -    border: 1px solid #ccc;
 +    border: 1px solid $grey;
      display: none;
      margin-bottom: $lineheight;
    }
    #newcomment {
 -    border-top: 1px solid #ccc;
 +    border-top: 1px solid $grey;
      padding-top: $lineheight;
      margin-top: $lineheight/2;
    }
@@@ -1729,13 -1720,13 +1720,13 @@@
      max-width: 740px;
    }
    .diary-comment {
 -    border-top: 1px dashed #ccc;
 +    border-top: 1px dashed $grey;
      padding-top: $lineheight/2;
      padding-bottom: $lineheight/2;
      &:first-child {
        margin-top: $lineheight/2;
        padding-top: $lineheight;
 -      border-top: 1px solid #ccc;
 +      border-top: 1px solid $grey;
      }
      &.deemphasize {
        background-color: #fee;
@@@ -1776,7 -1767,7 +1767,7 @@@
  
  .users-terms {
    .legale {
 -    border: 1px solid #ccc;
 +    border: 1px solid $grey;
      padding: $lineheight;
      margin-bottom: $lineheight;
      overflow: auto;
@@@ -1805,7 -1796,7 +1796,7 @@@
    position: relative;
    width: 500px;
    height: 400px;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
  }
  
  #accountForm .user_image {
@@@ -1857,17 -1848,17 +1848,17 @@@
  
  .messages {
    width: 100%;
 -  border: 1px solid #ddd;
 +  border: 1px solid $grey;
  
    input[type="submit"] {
      margin: auto;
    }
    tbody tr {
 -    border-top: 1px solid #ccc;
 +    border-top: 1px solid $grey;
    }
  
    .inbox-row {
 -    background: #f8f8ff;
 +    background: $offwhite;
    }
  
    .inbox-row-unread {
@@@ -1902,7 -1893,7 +1893,7 @@@
  .info-line {
    margin-bottom: $lineheight;
    padding: $lineheight/4 0px 4px 0px;
 -  border-bottom: 1px solid #ccc;
 +  border-bottom: 1px solid $grey;
  
    form, form div {
      display: inline;
@@@ -2091,7 -2082,7 +2082,7 @@@ input[type="password"]
  textarea {
    color: #222;
    background-color: #fff;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
    padding: 2px 5px;
    margin: 0;
    width: 200px;
@@@ -2111,7 -2102,7 +2102,7 @@@ textarea 
  img.user_image {
    max-width: 100px;
    max-height: 100px;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
    margin-bottom: $lineheight;
    float: left;
    margin-right: $lineheight;
@@@ -2120,7 -2111,7 +2111,7 @@@
  img.user_thumbnail {
    max-width: 50px;
    max-height: 50px;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
    margin-right: $lineheight;
  }
  
@@@ -2129,7 -2120,7 +2120,7 @@@ img.user_thumbnail_tiny 
    height: auto;
    max-width: 25px;
    max-height: 25px;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
  }
  
  /* Rules for geo microformats */
@@@ -2159,7 -2150,7 +2150,7 @@@ ul.secondary-actions 
      display: block;
      float: left;
      list-style: none;
 -    border-left: 1px solid #ccc;
 +    border-left: 1px solid $grey;
      padding-left: $lineheight/2;
      margin-right: $lineheight/2;
      &:first-child {
@@@ -2316,7 -2307,7 +2307,7 @@@ a.button 
  .prose {
    h1, h2 {
      padding-bottom: $lineheight/2;
 -    border-bottom: 1px dashed #cccccc;
 +    border-bottom: 1px dashed $grey;
      margin-bottom: $lineheight/2;
    }
  
@@@ -2334,13 -2325,13 +2325,13 @@@
  
    code {
      font-size: 13px;
 -    background: #e8e8e8;
 +    background: $lightgrey;
      padding: 2px 3px;
    }
  
    pre {
      font-size: 13px;
 -    background: #e8e8e8;
 +    background: $lightgrey;
      padding: 2px 3px;
      white-space: pre-wrap;
  
@@@ -2361,7 -2352,7 +2352,7 @@@
      border-left: $lineheight solid $offwhite;
      padding-left: $lineheight;
      margin: 0;
 -    color: #7E7E7E;
 +    color: $darkgrey;
    }
  
    ul, ol {
@@@ -2434,7 -2425,7 +2425,7 @@@ input.richtext_title[type="text"] 
      display: inline-block;
      vertical-align: top;
      margin-left: 15px;
 -    background-color: #f8f8ff;
 +    background-color: $offwhite;
      padding: $lineheight/2;
      width: 220px;
  
@@@ -2443,7 -2434,7 +2434,7 @@@
      }
  
      h4.heading, li {
 -      border-bottom: 1px solid #ccc;
 +      border-bottom: 1px solid $grey;
        margin-bottom: $lineheight/4;
        padding-bottom: $lineheight/4;
      }
@@@ -2472,7 -2463,7 +2463,7 @@@
  
  .note_list {
    tr.creator {
 -    background-color: #eeeeee;
 +    background-color: $lightgrey;
    }
  
    td {
@@@ -2534,7 -2525,7 +2525,7 @@@
    margin: 0;
    list-style: none;
    background-color: #ffffff;
 -  border: 1px solid #ccc;
 +  border: 1px solid $grey;
    border-radius: 0 3px 3px;
    *border-right-width: 2px;
    *border-bottom-width: 2px;
@@@ -2553,7 -2544,7 +2544,7 @@@
    margin: 9px 1px;
    *margin: -5px 0 5px;
    overflow: hidden;
 -  background-color: #e5e5e5;
 +  background-color: $lightgrey;
    border-bottom: 1px solid #ffffff;
  }
  
@@@ -2588,7 -2579,7 +2579,7 @@@
  .dropdown-menu > .disabled > a,
  .dropdown-menu > .disabled > a:hover,
  .dropdown-menu > .disabled > a:focus {
 -  color: #999999;
 +  color: $darkgrey;
  }
  
  .dropdown-menu > .disabled > a:hover,
@@@ -2701,7 -2692,8 +2692,7 @@@
  }
  
  .site-about #content {
 -  //background-color: #000;
 -  background-color: #eee;
 +  background-color: $lightgrey;
    background-position: 50% 50%;
    background-repeat: no-repeat;
    background-size: cover;
@@@ -2715,7 -2707,7 +2706,7 @@@
      right: 20px;
      bottom: 60px;
      text-shadow: #000 0px 1px 5px;
 -    color: #eee;
 +    color: $lightgrey;
      opacity: 0.8;
      display: none;
    }
@@@ -2775,7 -2767,7 +2766,7 @@@
        font-weight: 300;
        font-size: 34px;
        span {
 -        color: #76c551;
 +        color: $vibrant-green;
        }
      }
  
@@@ -2789,7 -2781,7 +2780,7 @@@
        background-repeat: no-repeat;
        background-image: image-url('about/osm.png');
        background-size: cover;
 -      background-color: #76c551;
 +      background-color: $vibrant-green;
      }
  
      .byosm {
@@@ -2803,7 -2795,7 +2794,7 @@@
        font: 500 20px/24px Helvetica, Arial, sans-serif;
        white-space: nowrap;
        color: #fff;
 -      background: #76c551;
 +      background: $vibrant-green;
      }
  
      .byosm span {
@@@ -2860,7 -2852,7 +2851,7 @@@
  }
  
  .read-reports {
 -  background: #eee;
 +  background: $lightgrey;
    opacity: 0.7;
  }