From e35fe204795bbb19d46f34af49c1ad4f7148e68f Mon Sep 17 00:00:00 2001 From: Sabba Petri Date: Mon, 23 Feb 2015 13:38:04 -0800 Subject: 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. --- app/helpers/events_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 063916a8df8..db0d4a26611 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -30,7 +30,7 @@ module EventsHelper end content_tag :li, class: "filter_icon #{active}" do - link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do + link_to request.path, class: 'btn has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do icon(icon_for_event[key]) + content_tag(:span, ' ' + tooltip) end end -- cgit v1.2.1 From ea31726781296efa9c2493c3f01aa62ca77b45fe Mon Sep 17 00:00:00 2001 From: Sabba Petri Date: Tue, 24 Feb 2015 09:06:59 -0800 Subject: Added a margin and a couple styles Added a background, rather than an outline, which should reduce clutter on the screen. --- app/assets/stylesheets/sections/events.scss | 10 ++++++++-- app/helpers/events_helper.rb | 2 +- 2 files changed, 9 insertions(+), 3 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; + } + } diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index db0d4a26611..063916a8df8 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -30,7 +30,7 @@ module EventsHelper end content_tag :li, class: "filter_icon #{active}" do - link_to request.path, class: 'btn has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do + link_to request.path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do icon(icon_for_event[key]) + content_tag(:span, ' ' + tooltip) end end -- cgit v1.2.1