diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 20:36:03 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 20:36:03 +0200 |
commit | 638f8541dcd4a718e0c8187bb1dd4dfddffeb57d (patch) | |
tree | b9da8f0d90c0f0cec92084e250c029c885b7a855 | |
parent | 25741c97a2ae1446fe03b86cc5e0bd5f49b41cf6 (diff) | |
download | gitlab-ce-638f8541dcd4a718e0c8187bb1dd4dfddffeb57d.tar.gz |
Hide labels filter for MRs and remove unnecessary padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | app/views/projects/issues/_issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/issues/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/_project_filter.html.haml | 23 |
3 files changed, 14 insertions, 13 deletions
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index 676bf4a02e5..2d69af0b2d1 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -2,7 +2,7 @@ .check-all-holder = check_box_tag "check_all_issues", nil, false, class: "check_all_issues left" .issues-filters - .dropdown.inline.prepend-left-10 + .dropdown.inline %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"} %i.icon-user %span.light assignee: diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 71a89af61a2..5e899d412c6 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -1,6 +1,6 @@ = render "head" .row .col-md-3 - = render 'shared/project_filter', project_entities_path: project_issues_path(@project) + = render 'shared/project_filter', project_entities_path: project_issues_path(@project), labels: true .col-md-9.issues-holder = render "issues" diff --git a/app/views/shared/_project_filter.html.haml b/app/views/shared/_project_filter.html.haml index 0d4023bbd70..abb2a80b7b8 100644 --- a/app/views/shared/_project_filter.html.haml +++ b/app/views/shared/_project_filter.html.haml @@ -26,17 +26,18 @@ = link_to project_filter_path(state: 'all') do All - %fieldset - %legend Labels - %ul.list-group - - 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 + - if defined?(labels) + %fieldset + %legend Labels + %ul.list-group + - 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 %fieldset - if %w(state scope milestone_id assignee_id label_name).select { |k| params[k].present? }.any? |