Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1cfee7a2
Commit
1cfee7a2
authored
Mar 31, 2021
by
David Pisek
Committed by
Jacques Erasmus
Mar 31, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply GitLab UI button styles to buttons in ee/app/views/shared/epic directory
parent
fe41d72c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
25 deletions
+35
-25
ee/app/helpers/ee/sorting_helper.rb
ee/app/helpers/ee/sorting_helper.rb
+1
-1
ee/app/views/shared/epic/_search_bar.html.haml
ee/app/views/shared/epic/_search_bar.html.haml
+3
-3
ee/app/views/shared/epic/_sort_dropdown.html.haml
ee/app/views/shared/epic/_sort_dropdown.html.haml
+14
-11
ee/app/views/shared/epic/_state_dropdown.html.haml
ee/app/views/shared/epic/_state_dropdown.html.haml
+11
-10
ee/changelogs/unreleased/231131-apply-gitlab-ui-button-styles-to-buttons-in-ee-app-views-shared.yml
...ab-ui-button-styles-to-buttons-in-ee-app-views-shared.yml
+6
-0
No files found.
ee/app/helpers/ee/sorting_helper.rb
View file @
1cfee7a2
...
@@ -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
...
...
ee/app/views/shared/epic/_search_bar.html.haml
View file @
1cfee7a2
...
@@ -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
...
...
ee/app/views/shared/epic/_sort_dropdown.html.haml
View file @
1cfee7a2
-
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
)
ee/app/views/shared/epic/_state_dropdown.html.haml
View file @
1cfee7a2
.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
)
ee/changelogs/unreleased/231131-apply-gitlab-ui-button-styles-to-buttons-in-ee-app-views-shared.yml
0 → 100644
View file @
1cfee7a2
---
title
:
Apply GitLab UI button and dropdown styles to buttons in ee/app/views/shared/epic
directory
merge_request
:
56729
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment