Commit 2a39ef32 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '224509-chevron-down-svg-search-wiki' into 'master'

Update icons to svg in several sort dropdowns

See merge request gitlab-org/gitlab!48092
parents aeef33f8 e90ad4bb
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
= sort_options_hash[@sort] = sort_options_hash[@sort]
- else - else
= sort_title_recently_created = sort_title_recently_created
= icon('chevron-down') = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-sort.dropdown-menu-right %ul.dropdown-menu.dropdown-menu-sort.dropdown-menu-right
%li %li
= link_to todos_filter_path(sort: sort_value_label_priority) do = link_to todos_filter_path(sort: sort_value_label_priority) do
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
= @project&.full_name || _("Any") = @project&.full_name || _("Any")
- if @project.present? - if @project.present?
= link_to sprite_icon("clear"), url_for(safe_params.except(:project_id)), class: 'search-clear js-search-clear has-tooltip', title: _('Clear') = link_to sprite_icon("clear"), url_for(safe_params.except(:project_id)), class: 'search-clear js-search-clear has-tooltip', title: _('Clear')
= icon("chevron-down") = sprite_icon("chevron-down", css_class: 'dropdown-menu-toggle-icon gl-top-3')
.dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-right .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-right
= dropdown_title(_("Filter results by project")) = dropdown_title(_("Filter results by project"))
= dropdown_filter(_("Search projects")) = dropdown_filter(_("Search projects"))
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.btn-group{ role: 'group' } .btn-group{ role: 'group' }
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' } %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
= sort_title = sort_title
= icon('chevron-down') = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
%li %li
= render_if_exists('search/sort_by_relevancy', sort_title: sort_title) = render_if_exists('search/sort_by_relevancy', sort_title: sort_title)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= milestone_sort_options_hash[@sort] = milestone_sort_options_hash[@sort]
- else - else
= sort_title_due_date_soon = sort_title_due_date_soon
= icon('chevron-down') = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-sort %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-sort
%li %li
= link_to page_filter_path(sort: sort_value_due_date_soon) do = link_to page_filter_path(sort: sort_value_due_date_soon) do
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.dropdown.inline .dropdown.inline
%button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } }
= sort_title = sort_title
= icon('chevron-down') = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-sort %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-sort
%li %li
- label_sort_options_hash.each do |value, title| - label_sort_options_hash.each do |value, title|
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
.col-sm-10 .col-sm-10
.select-wrapper .select-wrapper
= f.select :format, options_for_select(Wiki::MARKUPS, {selected: @page.format}), {}, class: 'form-control select-control' = f.select :format, options_for_select(Wiki::MARKUPS, {selected: @page.format}), {}, class: 'form-control select-control'
= icon('chevron-down') = sprite_icon('chevron-down', css_class: 'gl-absolute gl-top-3 gl-right-3 gl-text-gray-200')
.form-group.row .form-group.row
.col-sm-2.col-form-label= f.label :content, class: 'control-label-full-width' .col-sm-2.col-form-label= f.label :content, class: 'control-label-full-width'
......
---
title: Update icons to svg in several sort dropdowns
merge_request: 48092
author:
type: other
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