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

diff --combined app/assets/stylesheets/common.scss
index 16c986618fafe8a9c2f9b574be93c02b8a15ed2d,ae5ae2a239f1f0bf321651b27d266e3a1ed354ed..4b62b9af50d31bcb8efd1e83183c6a25745eb42f
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -565,6 -565,10 +565,6 @@@ body.small-nav 
  
  /* Rules for attribution text under the main map shown on printouts */
  
 -#attribution {
 -  display: none;
 -}
 -
  .donate-attr { color: darken($green, 10%) !important; }
  
  /* Rules for the sidebar */
@@@ -634,8 -638,9 +634,8 @@@ header .search_forms
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
 -  ul li {
 -    cursor: pointer;
 -    &.selected { background: $list-highlight; }
 +  ul li.selected {
 +    background: $list-highlight;
    }
  
    .search_more .loader {
@@@ -643,6 -648,11 +643,6 @@@
    }
  }
  
 -.search_results_error {
 -  color: #f00;
 -  padding: 10px 20px;
 -}
 -
  /* Rules for routing */
  
  div.direction {
@@@ -656,6 -666,8 +656,6 @@@ div.direction.i#{$i} { background-posit
  }
  
  td.distance {
 -    color: $darkgrey;
 -    text-align: right;
      font-size: x-small;
  }
  tr.turn {
@@@ -975,12 -987,6 +975,6 @@@ tr.turn:hover 
    }
  }
  
- /* Rules for the oauth authorization page */
- 
- .oauth-authorize ul {
-   list-style: none;
- }
- 
  /* Rules for messages pages */
  
  .messages {