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

diff --combined app/assets/stylesheets/common.scss
index 80a1c584b86dfdd928b73903a7e5a1951cc83790,ab9a9e31475415318d378cc60c67266f05b46871..848e3f1be6e072d5ce2357b840d309235727842c
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -533,13 -533,6 +533,6 @@@ body.small-nav 
    }
  }
  
- .layers-ui,
- .share-ui {
-   li:last-child {
-     margin-bottom: 0;
-   }
- }
- 
  .layers-ui {
    .base-layers {
      .leaflet-container {
@@@ -591,6 -584,10 +584,6 @@@
  }
  
  .share-ui {
 -  .share-tab {
 -    display: none;
 -  }
 -
    .share-link {
      input[type=text],
      textarea {
@@@ -607,6 -604,10 +600,6 @@@
      }
    }
  
 -  #embed_html {
 -    resize: vertical;
 -  }
 -
    #mapnik_scale {
      width: 100px;
    }
@@@ -634,6 -635,19 +627,6 @@@
  
  #attribution {
    display: none;
 -
 -  table {
 -    width: 100%
 -  }
 -}
 -
 -.attribution_license,
 -.attribution_project {
 -  text-align: left;
 -}
 -
 -.attribution_notice {
 -  text-align: center;
  }
  
  .donate-attr { color: darken($green, 10%) !important; }