summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2015-02-26 19:44:46 +0000
committerMarin Jankovski <marin@gitlab.com>2015-02-26 19:44:46 +0000
commit5bf492fe1ff116d07d3514cde12510092e140f85 (patch)
tree2212e9b5cfbd56be5f8d4dab03054189f17763fb
parentfc7f3bf8a12ebd874f3c09fa2f37bf8b69e782ac (diff)
parentea31726781296efa9c2493c3f01aa62ca77b45fe (diff)
downloadgitlab-ce-5bf492fe1ff116d07d3514cde12510092e140f85.tar.gz
Merge branch 'filter_icons_btn' into 'master'
Filter icons look like proper buttons The filter icons (Push events, Merge events, Comments, Team) now have a border that signifies they can be pushed. This not only keeps it in line with the rest of the application buttons, but it makes it more obvious, especially for the Merge events button with a checkbox icon. Fixes #1993 See merge request !1576
-rw-r--r--app/assets/stylesheets/sections/events.scss10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index b7614513216..a477359dc88 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -184,6 +184,12 @@
}
}
-.event_filter li a {
- padding: 5px 10px;
+.event_filter {
+
+ li a {
+ padding: 5px 10px;
+ background: rgba(0,0,0,0.045);
+ margin-left: 4px;
+ }
+
}