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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
b509021b
Commit
b509021b
authored
Jan 23, 2019
by
Ezekiel Kigbo
Committed by
Phil Hughes
Jan 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added `btn_class` to the dropdown for custom notifications
parent
c243b154
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/projects/buttons/_notifications.html.haml
app/views/projects/buttons/_notifications.html.haml
+2
-2
changelogs/unreleased/fix-55956-oversized-dropdown-button-custom-notifications.yml
...-55956-oversized-dropdown-button-custom-notifications.yml
+5
-0
No files found.
app/views/projects/buttons/_notifications.html.haml
View file @
b509021b
...
...
@@ -12,8 +12,8 @@
%button
.dropdown-new.btn.btn-default.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
_
(
"Notification setting - %{notification_title}"
)
%
{
notification_title:
notification_title
(
notification_setting
.
level
)
},
class:
"#{btn_class}"
,
"aria-label"
=>
_
(
"Notification setting - %{notification_title}"
)
%
{
notification_title:
notification_title
(
notification_setting
.
level
)
},
data:
{
container:
"body"
,
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
display:
'static'
}
}
=
sprite_icon
(
"notifications"
,
css_class:
"icon notifications-icon js-notifications-icon"
)
%span
.js-notification-loading.fa.hidden
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
=
sprite_icon
(
"arrow-down"
,
css_class:
"icon"
)
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
,
class:
"#{btn_class}"
}
=
sprite_icon
(
"arrow-down"
,
css_class:
"icon
mr-0
"
)
.sr-only
Toggle dropdown
-
else
%button
.dropdown-new.btn.btn-default.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
"Notification setting - #{notification_title(notification_setting.level)}"
,
class:
"#{btn_class}"
,
"aria-label"
=>
"Notification setting: #{notification_title(notification_setting.level)}"
,
data:
{
container:
"body"
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
...
...
changelogs/unreleased/fix-55956-oversized-dropdown-button-custom-notifications.yml
0 → 100644
View file @
b509021b
---
title
:
Fixed oversized custom project notification selector dropdown
merge_request
:
24557
author
:
type
:
fixed
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