button fixesgitlab-ui-buttons

2 files changed, 9 insertions, 6 deletions

diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index 7760c48cb92..829486c26fa 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -215,7 +215,6 @@
     vertical-align: middle;
     margin-right: 0.15em;
     font-size: 1.5em;
-    line-height: 1;
   }
 
   .award-control-icon-loading {
@@ -240,8 +239,8 @@
   .award-control-icon-super-positive {
     @include transition(opacity, transform);
     position: absolute;
-    left: 10px;
-    bottom: 6px;
+    left: 11px;
+    bottom: 7px;
     opacity: 0;
 
     path {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 2ec584e32b3..b55ede4aafd 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -825,13 +825,17 @@ $note-form-margin-left: 72px;
     white-space: nowrap;
   }
 
+  .btn-group {
+    margin-left: -4px;
+  }
+
   .discussion-next-btn {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
   }
 
   .btn {
-    line-height: 1.5;
+    line-height: $gl-line-height;
 
     svg {
       fill: $gray-darkest;
@@ -858,9 +862,9 @@ $note-form-margin-left: 72px;
 .line-resolve-all {
   vertical-align: middle;
   display: inline-block;
-  padding: $gl-padding-4 10px;
+  padding: 1px 12px;
   background-color: $gray-light;
-  border: 1px solid $border-color;
+  border: 1px solid $gray-400;
   border-radius: $border-radius-default;
   font-size: $gl-btn-small-font-size;