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
7a90d463
Commit
7a90d463
authored
Jun 03, 2019
by
Michel Engelen
Committed by
Annabel Dunstone Gray
Jun 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `dropdown-extended-height` class to labels dropdown
parent
a7fd826a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/shared/boards/components/sidebar/_labels.html.haml
app/views/shared/boards/components/sidebar/_labels.html.haml
+1
-1
app/views/shared/issuable/_label_dropdown.html.haml
app/views/shared/issuable/_label_dropdown.html.haml
+1
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
changelogs/unreleased/51022-added-extended-height-to-labels-dropdown.yml
...leased/51022-added-extended-height-to-labels-dropdown.yml
+5
-0
No files found.
app/views/shared/boards/components/sidebar/_labels.html.haml
View file @
7a90d463
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
%span
.dropdown-toggle-text
%span
.dropdown-toggle-text
{{ labelDropdownTitle }}
{{ labelDropdownTitle }}
=
icon
(
'chevron-down'
)
=
icon
(
'chevron-down'
)
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
.dropdown-extended-height
=
render
partial:
"shared/issuable/label_page_default"
=
render
partial:
"shared/issuable/label_page_default"
-
if
can?
(
current_user
,
:admin_label
,
current_board_parent
)
-
if
can?
(
current_user
,
:admin_label
,
current_board_parent
)
=
render
partial:
"shared/issuable/label_page_create"
,
locals:
{
show_add_list:
true
}
=
render
partial:
"shared/issuable/label_page_create"
,
locals:
{
show_add_list:
true
}
app/views/shared/issuable/_label_dropdown.html.haml
View file @
7a90d463
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
%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'
)
=
icon
(
'chevron-down'
)
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
.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
)
=
render
partial:
"shared/issuable/label_page_create"
=
render
partial:
"shared/issuable/label_page_create"
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
7a90d463
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
%span
.dropdown-toggle-text
{
class:
(
"is-default"
if
selected_labels
.
empty?
)
}
%span
.dropdown-toggle-text
{
class:
(
"is-default"
if
selected_labels
.
empty?
)
}
=
multi_label_name
(
selected_labels
,
"Labels"
)
=
multi_label_name
(
selected_labels
,
"Labels"
)
=
icon
(
'chevron-down'
,
'aria-hidden'
:
'true'
)
=
icon
(
'chevron-down'
,
'aria-hidden'
:
'true'
)
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
.dropdown-extended-height
=
render
partial:
"shared/issuable/label_page_default"
=
render
partial:
"shared/issuable/label_page_default"
-
if
issuable_sidebar
.
dig
(
:current_user
,
:can_admin_label
)
-
if
issuable_sidebar
.
dig
(
:current_user
,
:can_admin_label
)
=
render
partial:
"shared/issuable/label_page_create"
=
render
partial:
"shared/issuable/label_page_create"
...
...
changelogs/unreleased/51022-added-extended-height-to-labels-dropdown.yml
0 → 100644
View file @
7a90d463
---
title
:
"
Added
the
`.extended-height`
class
to
the
labels-dropdown"
merge_request
:
28659
author
:
Michel Engelen
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