Skip to content
Snippets Groups Projects
Commit a32941ae authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files

Display illustration and message if no filter is selected

parent c1b71e2f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -20,7 +20,7 @@
width: 100%;
}
 
$image-widths: 80 250 306 394 430;
$image-widths: 80 130 250 306 394 430;
@each $width in $image-widths {
&.svg-#{$width} {
img,
Loading
Loading
Loading
Loading
@@ -12,4 +12,8 @@
= render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", with_feature_enabled: 'issues', type: :issues
 
= render 'shared/issuable/filter', type: :issues
= render 'shared/issues'
- if current_user && @no_filters_set
= render 'shared/dashboard/no_filter_selected'
- else
= render 'shared/issues'
Loading
Loading
@@ -8,4 +8,8 @@
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request", with_feature_enabled: 'merge_requests', type: :merge_requests
 
= render 'shared/issuable/filter', type: :merge_requests
= render 'shared/merge_requests'
- if current_user && @no_filters_set
= render 'shared/dashboard/no_filter_selected'
- else
= render 'shared/merge_requests'
.row.empty-state.text-center
.col-xs-12
.svg-130
= image_tag 'illustrations/issue-dashboard_results-without-filter.svg'
.col-xs-12
.text-content
%h4
= _("Please select at least one filter to see results")
Loading
Loading
@@ -24,8 +24,9 @@
.filter-item.inline.labels-filter
= render "shared/issuable/label_dropdown", selected: selected_labels, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" }
 
.pull-right
= render 'shared/sort_dropdown'
- if !@no_filters_set
.pull-right
= render 'shared/sort_dropdown'
 
- has_labels = @labels && @labels.any?
.row-content-block.second-block.filtered-labels{ class: ("hidden" unless has_labels) }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment