Merge branch 'ee-jivl-remove-remaining-btn-xs-class-usage' into 'master'

EE: Remove the btn-xs class from the stylesheets

See merge request gitlab-org/gitlab-ee!6118

app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue

@@ -62,7 +62,7 @@ export default {
         v-if="mr.removeWIPPath"
         :disabled="isMakingRequest"
         type="button"
-        class="btn btn-default btn-xs js-remove-wip"
+        class="btn btn-default btn-sm js-remove-wip"
         @click="removeWIP">
         <i
           v-if="isMakingRequest"

app/assets/stylesheets/framework/buttons.scss

@@ -121,10 +121,6 @@
   &.btn-sm {
     margin-left: $btn-sm-side-margin;
   }
-
-  &.btn-xs {
-    margin-left: $btn-xs-side-margin;
-  }
 }
 
 @mixin btn-svg {
@@ -150,10 +146,6 @@
     line-height: 18px;
   }
 
-  &.btn-xs {
-    padding: 2px 5px;
-  }
-
   &.btn-success,
   &.btn-new,
   &.btn-create,

app/assets/stylesheets/framework/secondary_navigation_elements.scss

@@ -224,7 +224,7 @@
     flex-flow: row wrap;
 
     .nav-controls {
-      $controls-margin: $btn-xs-side-margin - 2px;
+      $controls-margin: $btn-margin-5 - 2px;
       flex: 0 0 100%;
 
       &.controls-flex {

app/assets/stylesheets/framework/variables.scss

@@ -279,7 +279,7 @@ $active-item-blue: $blue-500;
 $layout-link-gray: #7e7c7c;
 $btn-side-margin: 10px;
 $btn-sm-side-margin: 7px;
-$btn-xs-side-margin: 5px;
+$btn-margin-5: 5px;
 $issue-status-expired: $orange-500;
 $issuable-sidebar-color: $gl-text-color-secondary;
 $sidebar-block-hover-color: #ebebeb;

app/assets/stylesheets/pages/groups.scss

@@ -474,7 +474,7 @@ table.pipeline-project-metrics tr td {
       margin-left: 5px;
 
       > .btn {
-        margin-right: $btn-xs-side-margin;
+        margin-right: $btn-margin-5;
       }
     }
   }

app/assets/stylesheets/pages/note_form.scss

@@ -129,7 +129,7 @@
     .icon svg {
       position: relative;
       top: 2px;
-      margin-right: $btn-xs-side-margin;
+      margin-right: $btn-margin-5;
       width: $gl-font-size;
       height: $gl-font-size;
       fill: $orange-600;