Merge branch 'button-icon' into 'master'

Adds a btn-icon class See merge request gitlab-org/gitlab-ce!22870

Merge branch 'button-icon' into 'master'
Adds a btn-icon class See merge request gitlab-org/gitlab-ce!22870
bef19a29 · Tim Zallmann · 8467167b · 0ded56dd · bef19a29
Commit bef19a29 authored Nov 07, 2018 by Tim Zallmann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

app/assets/stylesheets/framework/buttons.scss app/assets/stylesheets/framework/buttons.scss +4 -0

No files found.
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -207,6 +207,10 @@
    @include btn-with-margin;
  }

+  &.btn-icon {
+    color: $gl-gray-700;
+  }
+
  .fa-caret-down,
  .fa-chevron-down {
    margin-left: 5px;