Revert "Merge branch '61145-fix-button-dimensions' into 'master'"

This reverts merge request !28545

6 files changed, 11 insertions, 4 deletions

diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 3d11aa58871..0b0a4e50146 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -214,10 +214,10 @@
 
   .label,
   .btn {
-    padding: $gl-bordered-btn-vert-padding $gl-bordered-btn-horz-padding;
+    padding: $gl-vert-padding $gl-btn-padding;
     border: 1px $border-color solid;
     font-size: $gl-font-size;
-    line-height: $gl-btn-line-height;
+    line-height: $line-height-base;
     border-radius: 0;
     display: flex;
     align-items: center;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 66ea70e79da..6a0127eb51c 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -929,6 +929,10 @@
       margin: 0;
     }
   }
+
+  .dropdown-toggle > .icon {
+    margin: 0 3px;
+  }
 }
 
 .right-sidebar-collapsed {
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index e51ca44476c..8359a60ec9f 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -267,6 +267,7 @@ ul.related-merge-requests > li {
     .fa-caret-down {
       pointer-events: none;
       color: inherit;
+      margin-left: 0;
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 1d57a4a4784..c6bac33e888 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -417,6 +417,7 @@ table {
 
     i {
       color: $white-light;
+      padding-right: 2px;
       margin-top: 2px;
     }
 
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 09a576c11cb..e453f4a2264 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -429,7 +429,7 @@
   padding: 0;
   background: transparent;
   border: 0;
-  line-height: 2;
+  line-height: 34px;
   margin: 0;
 
   > li + li::before {
@@ -792,6 +792,7 @@
 
     .btn {
       margin-top: $gl-padding;
+      padding: $gl-btn-vert-padding $gl-btn-padding;
       line-height: $gl-btn-line-height;
 
       .icon {
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 5c732ab0d1f..5664f46484e 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -90,7 +90,7 @@
 
   .add-to-tree {
     vertical-align: top;
-    padding: $gl-bordered-btn-vert-padding;
+    padding: 8px;
 
     svg {
       top: 0;