Merge branch 'pull/3091'

diff --combined app/assets/stylesheets/common.scss
index 481025d81fac69e855a7ea1dc83fb743dc53ff6e,136404858523a59108f558a90de33b535f9464f4..a8f138caa8194b4014c6a6d28c3360ee4156cfa7
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -4,6 -4,8 +4,6 @@@
  
  /* Styles common to large and small screens */
  
 -.fillL { background-color: white; }
 -
  /* Default rules for the body of every page */
  
  body {
@@@ -975,6 -977,16 +975,16 @@@ tr.turn:hover 
    }
  }
  
+ /* Bootstrap buttons don't have any vertical margin, so
+    they touch when adjacent buttons wrap onto a new line
+    e.g. wide form buttons on a narrow sidebar */
+ 
+ .btn-wrapper {
+   > .btn {
+     margin-bottom: $spacer * 0.25;
+   }
+ }
+ 
  /* Rules for export sidebar */
  
  .export_form {
@@@ -1317,6 -1329,13 +1327,6 @@@
        list-style-type: lower-alpha;
      }
    }
 -
 -  #decline {
 -    background: $lightblue;
 -    &:hover {
 -      background: darken($lightblue, $hovercolor);
 -    }
 -  }
  }
  
  /* Rules for the account settings page */