Commit 718d747b authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch '224509-chevron-down-svg-issuable' into 'master'

Update icons to svg for issuable pages

See merge request gitlab-org/gitlab!47596
parents 4770b83c c10fd812
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
- apply_is_default_styles = (selected.nil? || selected.empty?) && !no_default_styles - apply_is_default_styles = (selected.nil? || selected.empty?) && !no_default_styles
%span.dropdown-toggle-text{ class: ("is-default" if apply_is_default_styles) } %span.dropdown-toggle-text{ class: ("is-default" if apply_is_default_styles) }
= multi_label_name(selected, label_name) = multi_label_name(selected, label_name)
= icon('chevron-down') = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3")
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable.dropdown-extended-height .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable.dropdown-extended-height
= render partial: "shared/issuable/label_page_default", locals: { title: dropdown_title, show_footer: show_footer, show_create: show_create } = render partial: "shared/issuable/label_page_default", locals: { title: dropdown_title, show_footer: show_footer, show_create: show_create }
- if show_create && project && can?(current_user, :admin_label, project) - if show_create && project && can?(current_user, :admin_label, project)
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
%button.dropdown-menu-toggle.js-due-date-select{ type: 'button', data: { toggle: 'dropdown', field_name: "#{issuable_type}[due_date]", ability_name: issuable_type, issue_update: issuable_sidebar[:issuable_json_path], display: 'static' } } %button.dropdown-menu-toggle.js-due-date-select{ type: 'button', data: { toggle: 'dropdown', field_name: "#{issuable_type}[due_date]", ability_name: issuable_type, issue_update: issuable_sidebar[:issuable_json_path], display: 'static' } }
%span.dropdown-toggle-text %span.dropdown-toggle-text
= _('Due date') = _('Due date')
= icon('chevron-down', 'aria-hidden': 'true') = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3")
.dropdown-menu.dropdown-menu-due-date .dropdown-menu.dropdown-menu-due-date
= dropdown_title(_('Due date')) = dropdown_title(_('Due date'))
= dropdown_content do = dropdown_content do
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,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
= sortable_item(sort_title_priority, page_filter_path(sort: sort_value_priority), sort_title) = sortable_item(sort_title_priority, page_filter_path(sort: sort_value_priority), sort_title)
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' } %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
%span.dropdown-toggle-text.is-default %span.dropdown-toggle-text.is-default
= issuable.issue_type.capitalize || _("Select type") = issuable.issue_type.capitalize || _("Select type")
= icon('chevron-down') = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon gl-top-3")
.dropdown-menu.dropdown-menu-selectable.dropdown-select .dropdown-menu.dropdown-menu-selectable.dropdown-select
.dropdown-title.gl-display-flex .dropdown-title.gl-display-flex
%span.gl-ml-auto %span.gl-ml-auto
......
---
title: Update icons to svg for issuable pages
merge_request: 47596
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