consistent size, padding and margins for mr widget buttonsmr-widget-btn

1 files changed, 22 insertions, 24 deletions

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 2dc7f73a295..e2abe0f4087 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -15,15 +15,33 @@
     }
   }
 
+  .btn {
+    font-size: 15px;
+    padding: 5px 10px;
+
+    &.btn-xs {
+      line-height: 1;
+      padding: 4px 10px;
+    }
+
+    &.dropdown-toggle {
+      padding: 5px 7px;
+
+      .fa {
+        color: inherit;
+      }
+    }
+  }
+
+  * + .btn {
+    margin-left: 10px;
+  }
+
   .accept-merge-holder {
     .accept-action {
       display: inline-block;
       float: left;
 
-      .btn-success.dropdown-toggle .fa {
-        color: inherit;
-      }
-
       .accept-merge-request {
         &.ci-pending,
         &.ci-running {
@@ -216,20 +234,6 @@
   }
 
   .mr-widget-body {
-    .btn {
-      font-size: 15px;
-    }
-
-    .btn-group .btn {
-      padding: 5px 10px;
-
-      &.dropdown-toggle {
-        padding: 5px 7px;
-      }
-    }
-  }
-
-  .mr-widget-body {
     h4 {
       font-weight: bold;
       font-size: 15px;
@@ -497,8 +501,6 @@
   }
 
   .btn-clipboard {
-    @extend .pull-right;
-
     margin-right: 20px;
     margin-top: 5px;
     position: absolute;
@@ -683,10 +685,6 @@
 
   .btn {
     float: left;
-
-    &:not(:last-child) {
-      margin-right: 10px;
-    }
   }
 }