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

diff --combined app/assets/stylesheets/common.scss
index 3e0edf3ab01c9fb24952f0b2801a48742f7f0c3a,6b97dd1a9de2d091e0e0c6693907e55debbcbeae..6feb6d89936f95021d81a01d3e342b80da359d1b
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1257,16 -1257,6 +1257,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 {
@@@ -1428,7 -1418,7 +1418,7 @@@ abbr.geo 
    border-bottom: none;
  }
  
 -/* General styles for action lists / subnavs / pager navs */
 +/* General styles for action lists / subnavs */
  
  
  nav.secondary-actions {
@@@ -1441,6 -1431,10 +1431,6 @@@
      margin-bottom: 0;
      margin-left: -1px;
      padding: 0;
 -    &.pager {
 -      display: inline-block;
 -      margin-right: 60px;
 -    }
      > li {
        flex-basis: auto;
        list-style: none;
@@@ -1457,60 -1451,6 +1447,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 {