From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Wed, 11 Oct 2017 15:32:22 +0000 (+0200)
Subject: SONAR-8499 Remove orange underline for administration menu
X-Git-Tag: 6.7-RC1~291
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=effa3c890ad607467c8a88f6ae5f34d231b512ba;p=sonarqube.git

SONAR-8499 Remove orange underline for administration menu
---

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx
index 8e118add3ef..0cee6379a78 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx
@@ -206,7 +206,7 @@ export default class ComponentNavMenu extends React.PureComponent<Props> {
       return (
         <li>
           <Link
-            className={classNames('is-admin', { active: isSettingsActive })}
+            className={classNames({ active: isSettingsActive })}
             id="component-navigation-admin"
             to={{
               pathname: '/project/settings',
@@ -226,7 +226,7 @@ export default class ComponentNavMenu extends React.PureComponent<Props> {
     return (
       <li className="dropdown">
         <a
-          className={classNames('dropdown-toggle', 'is-admin', { active: isSettingsActive })}
+          className={classNames('dropdown-toggle', { active: isSettingsActive })}
           id="component-navigation-admin"
           data-toggle="dropdown"
           href="#">
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMenu-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMenu-test.tsx.snap
index 4c3676fd64f..5daf18eef7e 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMenu-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavMenu-test.tsx.snap
@@ -97,7 +97,7 @@ exports[`should work for all qualifiers 1`] = `
     className="dropdown"
   >
     <a
-      className="dropdown-toggle is-admin"
+      className="dropdown-toggle"
       data-toggle="dropdown"
       href="#"
       id="component-navigation-admin"
@@ -247,7 +247,7 @@ exports[`should work for all qualifiers 2`] = `
     className="dropdown"
   >
     <a
-      className="dropdown-toggle is-admin"
+      className="dropdown-toggle"
       data-toggle="dropdown"
       href="#"
       id="component-navigation-admin"
@@ -381,7 +381,7 @@ exports[`should work for all qualifiers 3`] = `
     className="dropdown"
   >
     <a
-      className="dropdown-toggle is-admin"
+      className="dropdown-toggle"
       data-toggle="dropdown"
       href="#"
       id="component-navigation-admin"
@@ -610,7 +610,7 @@ exports[`should work for all qualifiers 5`] = `
     className="dropdown"
   >
     <a
-      className="dropdown-toggle is-admin"
+      className="dropdown-toggle"
       data-toggle="dropdown"
       href="#"
       id="component-navigation-admin"
@@ -977,7 +977,7 @@ exports[`should work with extensions 1`] = `
     className="dropdown"
   >
     <a
-      className="dropdown-toggle is-admin"
+      className="dropdown-toggle"
       data-toggle="dropdown"
       href="#"
       id="component-navigation-admin"
@@ -1199,7 +1199,7 @@ exports[`should work with multiple extensions 1`] = `
     className="dropdown"
   >
     <a
-      className="dropdown-toggle is-admin"
+      className="dropdown-toggle"
       data-toggle="dropdown"
       href="#"
       id="component-navigation-admin"
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css
index 66c1a5daf30..ddbab111ec7 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.css
@@ -56,12 +56,6 @@
   color: #fff;
 }
 
-.global-navbar-menu > li > a.is-admin.active,
-.global-navbar-menu > li > a.is-admin:hover,
-.global-navbar-menu > li > a.is-admin:focus {
-  background-color: #ed7d20;
-}
-
 @media print {
   .navbar-global {
     display: none !important;
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js
index 12e48f92db5..2a1d784aa1c 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js
@@ -114,7 +114,7 @@ export default class GlobalNavMenu extends React.PureComponent {
 
     return (
       <li>
-        <Link to="/admin" className="is-admin" activeClassName="active">
+        <Link to="/admin" activeClassName="active">
           {translate('layout.settings')}
         </Link>
       </li>
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavMenu-test.js.snap b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavMenu-test.js.snap
index bd7e1eb88d9..c72f7259205 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavMenu-test.js.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/__snapshots__/GlobalNavMenu-test.js.snap
@@ -67,7 +67,6 @@ exports[`should show administration menu if the user has the rights 1`] = `
   <li>
     <Link
       activeClassName="active"
-      className="is-admin"
       onlyActiveOnIndex={false}
       style={Object {}}
       to="/admin"
diff --git a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
index aa28e0de170..43728684b84 100644
--- a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
+++ b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
@@ -50,8 +50,9 @@ export default class OrganizationNavigation extends React.PureComponent {
     return (
       <li className="dropdown">
         <a
-          className={classNames('dropdown-toggle', 'is-admin', { active: adminActive })}
+          className={classNames('dropdown-toggle', { active: adminActive })}
           data-toggle="dropdown"
+          id="organization-navigation-admin"
           href="#">
           {translate('layout.settings')}&nbsp;<i className="icon-dropdown" />
         </a>
diff --git a/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap b/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap
index d5a3413b98b..c4dcad9c707 100644
--- a/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap
@@ -105,9 +105,10 @@ exports[`admin 1`] = `
       className="dropdown"
     >
       <a
-        className="dropdown-toggle is-admin"
+        className="dropdown-toggle"
         data-toggle="dropdown"
         href="#"
+        id="organization-navigation-admin"
       >
         layout.settings
          
@@ -394,9 +395,10 @@ exports[`undeletable org 1`] = `
       className="dropdown"
     >
       <a
-        className="dropdown-toggle is-admin"
+        className="dropdown-toggle"
         data-toggle="dropdown"
         href="#"
+        id="organization-navigation-admin"
       >
         layout.settings
          
diff --git a/server/sonar-web/src/main/js/components/nav/NavBarTabs.css b/server/sonar-web/src/main/js/components/nav/NavBarTabs.css
index 366e8d15998..5eb011c7d59 100644
--- a/server/sonar-web/src/main/js/components/nav/NavBarTabs.css
+++ b/server/sonar-web/src/main/js/components/nav/NavBarTabs.css
@@ -21,9 +21,3 @@
 .navbar-tabs > li > a:focus {
   border-bottom-color: #4b9fd5;
 }
-
-.navbar-tabs > li > a.is-admin.active,
-.navbar-tabs > li > a.is-admin:hover,
-.navbar-tabs > li > a.is-admin:focus {
-  border-bottom-color: #ed7d20;
-}
diff --git a/tests/src/test/java/org/sonarqube/tests/ui/OrganizationUiExtensionsTest.java b/tests/src/test/java/org/sonarqube/tests/ui/OrganizationUiExtensionsTest.java
index 590926eb229..f12064e8c28 100644
--- a/tests/src/test/java/org/sonarqube/tests/ui/OrganizationUiExtensionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ui/OrganizationUiExtensionsTest.java
@@ -63,7 +63,7 @@ public class OrganizationUiExtensionsTest {
       .logIn().submitCredentials(administrator.getLogin())
       .open("/organizations/" + organization.getKey() + "/projects");
 
-    $("#context-navigation a.is-admin").click();
+    $("#organization-navigation-admin").click();
     $(By.linkText("Organization Admin Page")).shouldBe(Condition.visible).click();
 
     assertThat(url()).contains("uiextensionsplugin/organization_admin_page");