Unverified Commit a718a9af authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Restyle labels filter to match common style


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent fb0f1e263f56
......@@ -83,9 +83,9 @@ def labels_filter_path(label_name)
def label_filter_class(label_name)
if selected_label?(label_name)
'list-group-item active'
'label-filter-item active'
else
'list-group-item'
'label-filter-item light'
end
end
......
......@@ -29,15 +29,16 @@
- if defined?(labels)
%fieldset
%legend Labels
%ul.list-group
%ul.nav.nav-pills.nav-stacked.nav-small.labels-filter
- issue_label_names.each do |label_name|
= link_to labels_filter_path(label_name), class: label_filter_class(label_name) do
%span{class: "label #{label_css_class(label_name)}"}
%i.icon-tag
= label_name
- if selected_label?(label_name)
.pull-right
%i.icon-remove
%li{class: label_filter_class(label_name)}
= link_to labels_filter_path(label_name) do
%span{class: "label #{label_css_class(label_name)}"}
%i.icon-tag
= label_name
- if selected_label?(label_name)
.pull-right
%i.icon-remove
%fieldset
- if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any?
......
......@@ -4,19 +4,19 @@ class ProjectFilterLabels < Spinach::FeatureSteps
include SharedPaths
Then 'I should see "bug" in labels filter' do
within ".list-group" do
within ".labels-filter" do
page.should have_content "bug"
end
end
And 'I should see "feature" in labels filter' do
within ".list-group" do
within ".labels-filter" do
page.should have_content "feature"
end
end
And 'I should see "enhancement" in labels filter' do
within ".list-group" do
within ".labels-filter" do
page.should have_content "enhancement"
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment