From a8623002e69554540bea2b5118611503735de0aa Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Mon, 15 Jul 2019 13:28:20 +0200
Subject: [PATCH] Small UI changes [SCI-3699] (#1935)

* Small ui changes

* Markup fix

* Add class for addons
---
 app/assets/stylesheets/constants.scss       |  1 +
 app/assets/stylesheets/themes/menu_bar.scss |  5 +-
 app/views/shared/_navigation.html.erb       | 66 ++++++++++-----------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/app/assets/stylesheets/constants.scss b/app/assets/stylesheets/constants.scss
index 65e3b50e5..08e2cad8d 100644
--- a/app/assets/stylesheets/constants.scss
+++ b/app/assets/stylesheets/constants.scss
@@ -31,6 +31,7 @@ $brand-warning-light: #fcf7e4;
 $brand-danger-light: #efdfdf;
 $brand-light-blue: #e3f1f9;
 $brand-academy: #de0170;
+$brand-academy-dark: #c60064;
 
 // MS Office colors:
 $office-ms-word: #2b579a;
diff --git a/app/assets/stylesheets/themes/menu_bar.scss b/app/assets/stylesheets/themes/menu_bar.scss
index b178104af..96c2b0138 100644
--- a/app/assets/stylesheets/themes/menu_bar.scss
+++ b/app/assets/stylesheets/themes/menu_bar.scss
@@ -27,12 +27,13 @@
       font-size: $font-size-h6;
       margin-left: auto;
       margin-right: auto;
-      padding: 8px 0;
+      padding: 10px 0;
       text-align: center;
       word-break: normal;
 
       .fas {
         font-size: 18px;
+        padding-bottom: 5px;
       }
     }
 
@@ -60,7 +61,7 @@
     width: inherit;
 
     .academy-color {
-      color: $brand-academy;
+      color: $brand-academy-dark;
     }
   }
 
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index b14797288..8d70afb12 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -125,6 +125,39 @@
           <% end %>
         </li>
 
+        <!-- notifications -->
+        <li class="dropdown notifications-dropdown">
+          <a href="#"
+             id="notifications-dropdown"
+             class="dropdown-toggle"
+             title="<%= t('nav.label.notifications') %>"
+             data-toggle="dropdown"
+             role="button"
+             aria-haspopup="true"
+             aria-expanded="false"
+             data-href="<%= recent_notifications_url(current_user) %>">
+            <i class="fas fa-bell"></i>
+            <span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.notifications') %></span>
+            <span id="count-notifications"
+                  data-href="<%= unseen_notification_url(current_user) %>">
+            </span>
+          </a>
+          <ul class="dropdown-menu dropdown-notifications system-notifications">
+            <li class="notifications-dropdown-header">
+              <span><%= t('notifications.title') %></span>
+              <span class="pull-right">
+                <%= link_to t('nav.user.settings'), preferences_path %>
+              </span>
+            </li>
+            <li class="notifications-no-recent">
+              <em><%= t('notifications.no_recent') %></em>
+            </li>
+            <li class="notifications-dropdown-footer">
+              <%= link_to t('notifications.show_all'), notifications_path %>
+            </li>
+          </ul>
+        </li>
+
         <!-- greetings -->
         <li id="user-account-dropdown" class="dropdown">
           <a href="#"
@@ -157,39 +190,6 @@
           </ul>
         </li>
 
-        <!-- notifications -->
-        <li class="dropdown">
-          <a href="#"
-             id="notifications-dropdown"
-             class="dropdown-toggle"
-             title="<%= t('nav.label.notifications') %>"
-             data-toggle="dropdown"
-             role="button"
-             aria-haspopup="true"
-             aria-expanded="false"
-             data-href="<%= recent_notifications_url(current_user) %>">
-            <i class="fas fa-bell"></i>
-            <span class="visible-xs-inline visible-sm-inline"><%= t('nav.label.notifications') %></span>
-            <span id="count-notifications"
-                  data-href="<%= unseen_notification_url(current_user) %>">
-            </span>
-          </a>
-          <ul class="dropdown-menu dropdown-notifications system-notifications">
-            <li class="notifications-dropdown-header">
-              <span><%= t('notifications.title') %></span>
-              <span class="pull-right">
-                <%= link_to t('nav.user.settings'), preferences_path %>
-              </span>
-            </li>
-            <li class="notifications-no-recent">
-              <em><%= t('notifications.no_recent') %></em>
-            </li>
-            <li class="notifications-dropdown-footer">
-              <%= link_to t('notifications.show_all'), notifications_path %>
-            </li>
-          </ul>
-        </li>
-
         <li>
           <%= link_to Constants::ACADEMY_TR_LINK,  
             class: "academy-link flag",