diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-19 22:21:22 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-19 22:21:22 +0300 |
commit | 8cf2f51ca23f82069adca6ab790aea6ca532f8d0 (patch) | |
tree | b28f687ec5d1e328d407a6d500ef3b8e26e8a7e7 /app/assets/stylesheets/framework/buttons.scss | |
parent | 5ca29a45b19eb97c42145bb5a11e593a958dafbc (diff) | |
parent | ca093c4247b492e86cfae3a2c58dcf90a094ff76 (diff) |
Merge branch 'revert-feature-highlight' into 'master'
Revert feature highlight
Closes #38087
See merge request gitlab-org/gitlab-ce!14373
Diffstat (limited to 'app/assets/stylesheets/framework/buttons.scss')
-rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 4f208df4216..d178bc17462 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -46,15 +46,6 @@ } } -@mixin btn-svg { - svg { - height: 15px; - width: 15px; - position: relative; - top: 2px; - } -} - @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) { background-color: $light; border-color: $border-light; @@ -132,7 +123,6 @@ .btn { @include btn-default; @include btn-white; - @include btn-svg; color: $gl-text-color; @@ -231,6 +221,13 @@ } } + svg { + height: 15px; + width: 15px; + position: relative; + top: 2px; + } + svg, .fa { &:not(:last-child) { |