Add latest changes from gitlab-org/gitlab@master

2 files changed, 25 insertions, 0 deletions

diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index 418eafa153c..d0c3de59937 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -68,6 +68,23 @@
             .header-user-avatar {
               border-color: $search-and-nav-links;
             }
+
+            .header-user-notification-dot {
+              border: 2px solid $nav-svg-color;
+            }
+          }
+
+          &:focus:hover,
+          &:focus {
+            &.header-user-dropdown-toggle .header-user-notification-dot {
+              border-color: $white-light;
+            }
+          }
+
+          &:hover {
+            &.header-user-dropdown-toggle .header-user-notification-dot {
+              border-color: $nav-svg-color + 33;
+            }
           }
 
           &:hover,
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 5ae4f72de56..dd338a7134b 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -567,6 +567,14 @@
   border: 1px solid $gray-normal;
 }
 
+.header-user-notification-dot {
+  background-color: $orange-500;
+  height: 10px;
+  width: 10px;
+  right: 8px;
+  top: -8px;
+}
+
 .with-performance-bar .navbar-gitlab {
   top: $performance-bar-height;
 }