fix SONAR-6041 update the navbar background

diff --git a/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs b/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs
index 8d86b1926a8b621d6b4eba7ad071fa8ba310b3af..4cd6ab2bf265e21c3663d501e8cc830c00ab5f80 100644 (file)
--- a/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs
+++ b/server/sonar-web/src/main/hbs/nav/nav-navbar.hbs
@@ -48,12 +48,6 @@
   </ul>
 
   <ul class="nav navbar-nav navbar-right">
-    <li class="dropdown js-search-dropdown">
-      <a class="dropdown-toggle js-search-dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="icon-search navbar-icon"></i>&nbsp;<span class="icon-dropdown"></span>
-      </a>
-      <div class="js-search-region dropdown-menu dropdown-menu-right"></div>
-    </li>
     {{#if user}}
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
@@ -74,6 +68,12 @@
         <a class="js-login" href="{{link '/sessions/new'}}">{{t 'layout.login'}}</a>
       </li>
     {{/if}}
+    <li class="dropdown js-search-dropdown">
+      <a class="dropdown-toggle js-search-dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="icon-search navbar-icon"></i>&nbsp;<span class="icon-dropdown"></span>
+      </a>
+      <div class="js-search-region dropdown-menu dropdown-menu-right"></div>
+    </li>
     {{#if isUserAdmin}}
       <li>
         <a href="{{link '/settings/index'}}"><i class="icon-settings navbar-icon"></i></a>

diff --git a/server/sonar-web/src/main/less/navbar.less b/server/sonar-web/src/main/less/navbar.less
index d1a27e7a51be8befb1ebf1154aba5936e41e4e0d..89b83f14115e9806526fae680b0563e053a2ef41 100644 (file)
--- a/server/sonar-web/src/main/less/navbar.less
+++ b/server/sonar-web/src/main/less/navbar.less
@@ -3,7 +3,7 @@
 @import (reference) "ui";
 
 @navbarBackground: #262626;
-@navbarProjectBackground: @blue;
+@navbarProjectBackground: @navbarBackground;
 @navbarSettingsBackground: #591500;
 
 @navbarHeight: 36px;
@@ -189,8 +189,12 @@
     background-color: darken(@navbarProjectBackground, 10%);
   }
 
-  .sq-logo .sq-logo-arc {
-    fill: #fff;
+  .sq-logo {
+    margin-left: -78px;
+  }
+
+  .sq-logo .sq-logo-letter {
+    display: none;
   }
 }
 
@@ -208,4 +212,12 @@
   .navbar-nav > .dropdown.open > a {
     background-color: darken(@navbarSettingsBackground, 10%);
   }
+
+  .sq-logo {
+    margin-left: -78px;
+  }
+
+  .sq-logo .sq-logo-letter {
+    display: none;
+  }
 }