summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-21 15:31:39 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-06-21 11:52:06 -0400
commit605e122952e7c5595b2e977d29c03dc70930a848 (patch)
tree9a1750b4863a5cdf0cd0f019e9d123c7ab4b25cc /app/assets/stylesheets
parent16b4218791958826896344fdc3403a2dcdc23a58 (diff)
downloadgitlab-ce-605e122952e7c5595b2e977d29c03dc70930a848.tar.gz
Merge branch 'notification-dropdown-active-fix' into 'master'
Fixed issue with notification dropdown not updating active ## What does this MR do? This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success. ## What are the relevant issue numbers? Closes #18480 ## Screenshots (if relevant) ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif) See merge request !4615
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/projects.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 093d5e18516..a2e5522d1a3 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -101,7 +101,8 @@
.notifications-btn {
- .fa-bell {
+ .fa-bell,
+ .fa-spinner {
margin-right: 6px;
}