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
4042afbf
Commit
4042afbf
authored
Jul 24, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-bell icons with notifications svg
parent
eb2bd98b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-6
app/views/shared/notifications/_button.html.haml
app/views/shared/notifications/_button.html.haml
+4
-4
changelogs/unreleased/225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml
...lace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml
+5
-0
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
4042afbf
...
@@ -224,12 +224,6 @@
...
@@ -224,12 +224,6 @@
font-size
:
$gl-font-size-large
;
font-size
:
$gl-font-size-large
;
}
}
}
}
.notifications-btn
{
.fa-bell
{
margin-right
:
0
;
}
}
}
}
.nav
>
.project-buttons
{
.nav
>
.project-buttons
{
...
...
app/views/shared/notifications/_button.html.haml
View file @
4042afbf
...
@@ -17,16 +17,16 @@
...
@@ -17,16 +17,16 @@
.js-notification-toggle-btns
.js-notification-toggle-btns
%div
{
class:
(
"btn-group"
if
notification_setting
.
custom?
)
}
%div
{
class:
(
"btn-group"
if
notification_setting
.
custom?
)
}
-
if
notification_setting
.
custom?
-
if
notification_setting
.
custom?
%button
.dropdown-new.btn.btn-defaul
t
.has-tooltip.notifications-btn.text-left
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
display:
'static'
}
}
%button
.dropdown-new.btn.btn-defaul
.btn-icon.gl-button
.has-tooltip.notifications-btn.text-left
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
display:
'static'
}
}
=
icon
(
"bell"
,
class:
"js-notification-loading"
)
=
sprite_icon
(
"notifications"
,
size:
16
,
css_
class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
=
notification_title
(
notification_setting
.
level
)
%button
.btn.dropdown-toggle.d-flex
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
%button
.btn.dropdown-toggle.d-flex
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
.sr-only
Toggle dropdown
.sr-only
Toggle dropdown
-
else
-
else
%button
.dropdown-new.btn.btn-default.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
%button
.dropdown-new.btn.btn-default.
btn-icon.gl-button.
has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
.float-left
.float-left
=
icon
(
"bell"
,
class:
"js-notification-loading"
)
=
sprite_icon
(
"notifications"
,
size:
16
,
css_
class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
=
notification_title
(
notification_setting
.
level
)
.float-right
.float-right
=
icon
(
"caret-down"
)
=
icon
(
"caret-down"
)
...
...
changelogs/unreleased/225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml
0 → 100644
View file @
4042afbf
---
title
:
Replace fa-bell icons with GitLab SVG notifications icon
merge_request
:
37676
author
:
type
:
changed
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