summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-11-07 22:00:58 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-11-07 22:00:58 +0000
commitbef19a29175f549c891178a5f3f46f9f8bd24d26 (patch)
treef72a9ebc8b8a57005421d58dff49e20cb6a168a2 /app/assets
parent8467167bbc7fb16e25b202c6eda37a9fe1f1a9d7 (diff)
parent0ded56dd7ef713939ce5e42b67976961eea55f46 (diff)
downloadgitlab-ce-bef19a29175f549c891178a5f3f46f9f8bd24d26.tar.gz
Merge branch 'button-icon' into 'master'
Adds a btn-icon class See merge request gitlab-org/gitlab-ce!22870
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/buttons.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index c4296c7a88a..1dbb5ca3e4c 100644
--- 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;