Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 20 deletions

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index db41d28575f..56fd8ed770f 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -264,11 +264,8 @@
     width: 15px;
   }
 
-  svg,
-  .fa {
-    &:not(:last-child) {
-      margin-right: 5px;
-    }
+  svg:not(:last-child) {
+    margin-right: 5px;
   }
 }
 
@@ -358,24 +355,15 @@
 
 .btn-loading {
   &:not(.disabled) {
-    .fa,
     .spinner {
       display: none;
     }
   }
-
-  .fa {
-    margin-right: 5px;
-  }
 }
 
 .btn-build {
   margin-left: 10px;
 
-  i {
-    color: $gl-text-color-secondary;
-  }
-
   svg {
     fill: $gl-text-color-secondary;
   }
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 20d44b71bf6..e40ef04c4a0 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -169,7 +169,6 @@
     transition-duration: 0.3s;
   }
 
-  .fa,
   svg {
     position: relative;
     top: 5px;
@@ -361,11 +360,6 @@
   color: $gray-400;
   fill: $gray-400;
 
-  .fa {
-    position: relative;
-    font-size: 16px;
-  }
-
   svg {
     @include btn-svg;
     margin: 0;