Commit 1cfee7a2 authored by David Pisek's avatar David Pisek Committed by Jacques Erasmus

Apply GitLab UI button styles to buttons in ee/app/views/shared/epic directory

parent fe41d72c
...@@ -72,7 +72,7 @@ module EE ...@@ -72,7 +72,7 @@ module EE
link_to sprite_icon(sort_icon), link_to sprite_icon(sort_icon),
page_filter_path(sort: opposite_sorting_param), page_filter_path(sort: opposite_sorting_param),
class: "btn btn-default has-tooltip qa-reverse-sort btn-sort-direction", class: "btn gl-button btn-default btn-icon has-tooltip qa-reverse-sort btn-sort-direction",
title: _("Sort direction") title: _("Sort direction")
end end
end end
......
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
.epics-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row.row-content-block.second-block .epics-details-filters.filtered-search-block.d-flex.flex-column.flex-md-row.row-content-block.second-block
- if show_roadmap_presets - if show_roadmap_presets
.btn-group.btn-group-toggle.gl-mr-3.js-btn-roadmap-presets{ data: { toggle: 'buttons' } } .btn-group.btn-group-toggle.gl-mr-3.js-btn-roadmap-presets{ data: { toggle: 'buttons' } }
%label.btn.btn-default.btn-roadmap-preset{ class: ("active" if is_quarters) } %label.btn.gl-button.btn-secondary.btn-roadmap-preset{ class: ("active" if is_quarters) }
%input{ type: 'radio', name: 'presetType', autocomplete: 'off', checked: ("checked" if is_quarters), value: 'QUARTERS' } %input{ type: 'radio', name: 'presetType', autocomplete: 'off', checked: ("checked" if is_quarters), value: 'QUARTERS' }
= _('Quarters') = _('Quarters')
%label.btn.btn-default.btn-roadmap-preset{ class: ("active" if is_months) } %label.btn.gl-button.btn-secondary.btn-roadmap-preset{ class: ("active" if is_months) }
%input{ type: 'radio', name: 'presetType', autocomplete: 'off', checked: ("checked" if is_months), value: 'MONTHS' } %input{ type: 'radio', name: 'presetType', autocomplete: 'off', checked: ("checked" if is_months), value: 'MONTHS' }
= _('Months') = _('Months')
%label.btn.btn-default.btn-roadmap-preset{ class: ("active" if is_weeks) } %label.btn.gl-button.btn-secondary.btn-roadmap-preset{ class: ("active" if is_weeks) }
%input{ type: 'radio', name: 'presetType', autocomplete: 'off', checked: ("checked" if is_weeks), value: 'WEEKS' } %input{ type: 'radio', name: 'presetType', autocomplete: 'off', checked: ("checked" if is_weeks), value: 'WEEKS' }
= _('Weeks') = _('Weeks')
.filter-dropdown-container.gl-mr-3 .filter-dropdown-container.gl-mr-3
......
- hide_extra_sort_options = local_assigns.fetch(:hide_extra_sort_options, false) - hide_extra_sort_options = local_assigns.fetch(:hide_extra_sort_options, false)
- sorted_by = epics_sort_options_hash[@sort] - sorted_by = epics_sort_options_hash[@sort]
.dropdown.gl-ml-3 .dropdown.gl-new-dropdown.gl-ml-3
.btn-group.d-flex.d-md-inline-flex .btn-group.d-flex.d-md-inline-flex
%button.btn.dropdown-toggle.epics-sort-btn{ type: 'button', data: { toggle: 'dropdown' } } .btn-group
= sorted_by %button.btn.gl-button.btn-default.dropdown-toggle.epics-sort-btn{ type: 'button', data: { toggle: 'dropdown' } }
= sprite_icon('chevron-down', css_class: 'gl-text-gray-200') %span.gl-new-dropdown-button-text
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort = sorted_by
%li = sprite_icon('chevron-down', css_class: 'gl-button-icon dropdown-chevron gl-icon s16')
- if !hide_extra_sort_options %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
= sortable_item(sort_title_created_date, page_filter_path(sort: sort_value_recently_created), sorted_by) .gl-new-dropdown-inner
= sortable_item(sort_title_recently_updated, page_filter_path(sort: sort_value_recently_updated), sorted_by) %li
= sortable_item(sort_title_start_date, page_filter_path(sort: sort_value_start_date_soon), sorted_by) - if !hide_extra_sort_options
= sortable_item(sort_title_end_date, page_filter_path(sort: sort_value_end_date), sorted_by) = sortable_item(sort_title_created_date, page_filter_path(sort: sort_value_recently_created), sorted_by)
= sortable_item(sort_title_recently_updated, page_filter_path(sort: sort_value_recently_updated), sorted_by)
= sortable_item(sort_title_start_date, page_filter_path(sort: sort_value_start_date_soon), sorted_by)
= sortable_item(sort_title_end_date, page_filter_path(sort: sort_value_end_date), sorted_by)
= sort_order_button(@sort) = sort_order_button(@sort)
.dropdown.inline.dropdown-epics-state .dropdown.gl-new-dropdown.inline.dropdown-epics-state
%button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' } } %button.btn.gl-button.btn-default.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' } }
= epic_state_title(@epics_state) = epic_state_title(@epics_state)
= sprite_icon('chevron-down', css_class: 'gl-text-gray-200') = sprite_icon('chevron-down', css_class: 'gl-button-icon gl-icon dropdown-chevron' )
%ul.dropdown-menu.dropdown-menu-selectable %ul.dropdown-menu.dropdown-menu-selectable
%li .gl-new-dropdown-inner
= epic_state_dropdown_link('all', @epics_state) %li
.dropdown-divider = epic_state_dropdown_link('all', @epics_state)
%li .dropdown-divider
= epic_state_dropdown_link('opened', @epics_state) %li
%li = epic_state_dropdown_link('opened', @epics_state)
= epic_state_dropdown_link('closed', @epics_state) %li
= epic_state_dropdown_link('closed', @epics_state)
---
title: Apply GitLab UI button and dropdown styles to buttons in ee/app/views/shared/epic
directory
merge_request: 56729
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