Commit 8f37b22a authored by Phil Hughes's avatar Phil Hughes

Merge branch '225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon' into 'master'

Replace fa-bell icons with GitLab SVG notifications icon

Closes #225934

See merge request gitlab-org/gitlab!37676
parents 7e782ddc 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 {
......
...@@ -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-default.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")
......
---
title: Replace fa-bell icons with GitLab SVG notifications icon
merge_request: 37676
author:
type: changed
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