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

diff --combined app/assets/stylesheets/common.scss
index f16785d823f1a5d1ce4568fcdbec80056fd5cce5,a94b6700a0680ba2670b3fd6beb4e59b1bdabf02..d2ab3d272746755d1ecf6d15660e07e7a734be53
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -511,15 -511,6 +511,6 @@@ body.small-nav 
        padding: 10px 20px;
      }
  
-     a.close-button {
-       float: right;
-       padding:5px;
-       font-size:20px;
-       line-height:10px;
-       color:#222;
-       border:1px solid $grey;
-     }
- 
      .tooltip {
        opacity: 1;
        border: 1px solid $grey;
@@@ -1257,6 -1248,16 +1248,6 @@@ tr.turn:hover 
    display: inline !important;
  }
  
 -/* Rules for the oauth settings page */
 -
 -.oauth_clients .buttons .oauth-edit {
 -  border-radius: 2px 0 0 2px;
 -}
 -
 -.oauth_clients .buttons .oauth-delete {
 -  border-radius: 0 2px 2px 0;
 -}
 -
  /* Rules for the oauth authorization page */
  
  .oauth-authorize ul {
@@@ -1418,7 -1419,7 +1409,7 @@@ abbr.geo 
    border-bottom: none;
  }
  
 -/* General styles for action lists / subnavs / pager navs */
 +/* General styles for action lists / subnavs */
  
  
  nav.secondary-actions {
@@@ -1431,6 -1432,10 +1422,6 @@@
      margin-bottom: 0;
      margin-left: -1px;
      padding: 0;
 -    &.pager {
 -      display: inline-block;
 -      margin-right: 60px;
 -    }
      > li {
        flex-basis: auto;
        list-style: none;
@@@ -1447,6 -1452,60 +1438,6 @@@ div.secondary-actions 
    text-align: center;
  }
  
 -.buttons {
 -  min-width: 200px;
 -  input[type="submit"],
 -  input[type="button"],
 -  input[type="reset"],
 -  .button,
 -  .button_to {
 -    box-sizing: border-box;
 -    float: left;
 -    border-radius: 0;
 -    margin:0;
 -    min-width: 75px;
 -    max-width: 180px;
 -    border-right:1px solid white;
 -    text-overflow: ellipsis;
 -    white-space: nowrap;
 -    overflow: hidden;
 -  }
 -  input:first-child,
 -  .button:first-child,
 -  .button_to:first-child {
 -    border-radius:2px 0 0 2px;
 -  }
 -  input:last-child,
 -  .button:last-child,
 -  .button_to:last-child {
 -    border-radius:0 2px 2px 0;
 -    border-right-width: 0;
 -  }
 -  input:only-child,
 -  .button:only-child,
 -  .button_to:only-child,
 -  *[value="Hide"] + input:last-child,
 -  *[value="Hide"] + .button:last-child,
 -  *[value="Hide"] + .button_to:last-child {
 -    border-radius:2px;
 -    border-right-width: 0;
 -  }
 -    /* if a 3-button set has a hidden middle button */
 -  *[value="Hide"] + input:nth-child(3),
 -  *[value="Hide"] + .button:nth-child(3),
 -  *[value="Hide"] + .button_to:nth-child(3) {
 -    border-radius:0 2px 2px 0;
 -    border-right-width: 0;
 -  }
 -  /* if a 3-button set starts with a hidden button */
 -  *[value="Hide"] + input:nth-child(2):not(:last-child),
 -  *[value="Hide"] + .button:nth-child(2):not(:last-child),
 -  *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
 -    border-radius:2px 0 0 2px;
 -    border-right-width: 1px;
 -  }
 -}
 -
  /* Create a single-line dl */
  
  dl.dl-inline {
@@@ -1578,6 -1637,10 +1569,6 @@@
  
  .site-about #content {
    background-color: $lightgrey;
 -  background-position: 50% 50%;
 -  background-repeat: no-repeat;
 -  background-size: cover;
 -  background-attachment: fixed;
  
    .content-inner {
      max-width: 760px;