Merge master with css changes

diff --combined app/assets/stylesheets/common.scss
index 2eb6bf98eae8aa0de2b8ad54cbebd9a7be610652,8d3da8f7e8267d467b642176d13e9e6ae8a8ecd9..1f80a9b5b520c08029d9965e273b92b731ec1429
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -55,6 -55,7 +55,6 @@@ small, aside 
  .icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
  .icon.link        { /* no-r2 */ background-position: -180px 0; }
  .icon.close       { /* no-r2 */ background-position: -200px 0; }
 -.close-wrap:hover .icon.close,
  .icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
  .icon.check       { /* no-r2 */ background-position: -220px 0; }
  .icon.note        { /* no-r2 */ background-position: -240px 0; }
@@@ -357,14 -358,22 +357,6 @@@ body.compact-nav 
        clear: both;
        width: 100%;
      }
--
-     h2 {
-       font-size: 1.5rem;
-     }
 -    .close-wrap {
 -      cursor: pointer;
 -      position: absolute;
 -      top: 0;
 -      right: 0;
 -      width: 60px;
 -      height: 60px;
--
-     h3, h4 {
-       font-size: 1.25rem;
 -      .icon.close {
 -        pointer-events: none;
 -        position: absolute;
 -        right: 20px;
 -        top: 20px;
 -      }
--    }
    }
  
    .overlay-sidebar #sidebar {
@@@ -616,6 -625,11 +608,6 @@@
    padding: $lineheight/2 $lineheight;
    // background: $offwhite;
    // border-bottom: 1px solid $grey;
 -  > .close {
 -    float: right;
 -    margin-top: 2px;
 -    cursor: pointer;
 -  }
  }
  
  #browse_status {
@@@ -1437,13 -1451,11 +1429,11 @@@ dl.dl-inline 
  .richtext,
  .prose {
    code {
-     font-size: 13px;
      background: $lightgrey;
      padding: 2px 3px;
    }
  
    pre {
-     font-size: 13px;
      background: $lightgrey;
      padding: 2px 3px;
      white-space: pre-wrap;
@@@ -1486,19 -1498,10 +1476,10 @@@
  
  /* Rules for the "Welcome" page */
  .site-welcome, .site-fixthemap {
-   .center {
-     text-align: center;
-     .sprite {
-       float: none;
-       margin: auto;
-     }
-   }
- 
    .sprite {
      background-image: image-url("welcome-sprite.png");
      background-size: 500px 250px;
      display: block;
-     float: left;
    }
  
    .icon-list {
@@@ -1548,15 -1551,6 +1529,6 @@@
      /* no-r2 */ background-position: -350px 0;
    }
  
-   .start-mapping {
-     margin: auto;
-     cursor: pointer;
-     border: none;
-     padding: 20px 40px;
-     font-size: 30px;
-     text-decoration: none;
-   }
- 
    .icon.note {
      background-color: #333;
      border-radius: 4px;