From 4042afbfc0762a24a9838bdf31d0ca1f746effe5 Mon Sep 17 00:00:00 2001 From: Martin Wortschack Date: Fri, 24 Jul 2020 09:07:59 +0200 Subject: [PATCH] Replace fa-bell icons with notifications svg --- app/assets/stylesheets/pages/projects.scss | 6 ------ app/views/shared/notifications/_button.html.haml | 8 ++++---- ...e-fa-bell-icons-with-gitlab-svg-notifications-icon.yml | 5 +++++ 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 changelogs/unreleased/225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index a1a9489e6599e4..5abf8e1c64ff07 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -224,12 +224,6 @@ font-size: $gl-font-size-large; } } - - .notifications-btn { - .fa-bell { - margin-right: 0; - } - } } .nav > .project-buttons { diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml index 2b3e986a841ca5..b4a274a3ecf3b3 100644 --- a/app/views/shared/notifications/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml @@ -17,16 +17,16 @@ .js-notification-toggle-btns %div{ class: ("btn-group" 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' } } - = icon("bell", class: "js-notification-loading") + %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' } } + = sprite_icon("notifications", size: 16, css_class: "js-notification-loading") = notification_title(notification_setting.level) %button.btn.dropdown-toggle.d-flex{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } } = icon('caret-down') .sr-only Toggle dropdown - 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 - = icon("bell", class: "js-notification-loading") + = sprite_icon("notifications", size: 16, css_class: "js-notification-loading") = notification_title(notification_setting.level) .float-right = icon("caret-down") diff --git a/changelogs/unreleased/225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml b/changelogs/unreleased/225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml new file mode 100644 index 00000000000000..ea7b5a91be4d58 --- /dev/null +++ b/changelogs/unreleased/225934-replace-fa-bell-icons-with-gitlab-svg-notifications-icon.yml @@ -0,0 +1,5 @@ +--- +title: Replace fa-bell icons with GitLab SVG notifications icon +merge_request: 37676 +author: +type: changed -- GitLab