Merge branch '55257-fix-sm-button-sizes' into 'master'

Fix small button line height

Closes #55257

See merge request gitlab-org/gitlab-ce!23779

app/assets/stylesheets/framework/buttons.scss

@@ -148,8 +148,8 @@
 
   &.btn-xs {
     padding: 2px $gl-btn-padding;
-    font-size: $gl-btn-small-font-size;
-    line-height: $gl-btn-small-line-height;
+    font-size: $gl-btn-xs-font-size;
+    line-height: $gl-btn-xs-line-height;
   }
 
   &.btn-success,

app/assets/stylesheets/framework/variables.scss

@@ -371,7 +371,9 @@ $gl-btn-line-height: 16px;
 $gl-btn-vert-padding: 8px;
 $gl-btn-horz-padding: 12px;
 $gl-btn-small-font-size: 13px;
-$gl-btn-small-line-height: 13px;
+$gl-btn-small-line-height: 18px;
+$gl-btn-xs-font-size: 13px;
+$gl-btn-xs-line-height: 13px;
 
 /*
 * Badges