This is an automated email from the ASF dual-hosted git repository.

atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 113d4fd  AMBARI-23572 Navigation sub-menu style changes
113d4fd is described below

commit 113d4fdf1ea8b10aa46c81e05c3e7525503ed4ec
Author: Andrii Tkach <atk...@apache.org>
AuthorDate: Fri Apr 13 13:59:50 2018 +0300

    AMBARI-23572 Navigation sub-menu style changes
---
 ambari-web/app/styles/alerts.less                  | 25 +++++++++++-----------
 ambari-web/app/styles/application.less             |  2 +-
 ambari-web/app/styles/bootstrap_overrides.less     |  6 ++++++
 .../app/templates/main/service/menu_item.hbs       |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index efaf25d..5c7bd12 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -41,18 +41,19 @@
   background-color: #999;
 }
 
-.nav-pills .service-alerts-critical {
-  font-size: 8px;
-  line-height: 1.7em;
-  margin-left: -12px;
-  color: @health-status-red;
-}
-
-.nav-pills .service-alerts-warning {
-  font-size: 8px;
-  line-height: 1.7em;
-  margin-left: -12px;
-  color: @health-status-orange;
+.nav-pills {
+  .status-icon {
+    font-size: 8px;
+    line-height: 1.7em;
+    margin-left: -15px;
+    margin-right: 3px;
+  }
+  .service-alerts-critical {
+    color: @health-status-red;
+  }
+  .service-alerts-warning {
+    color: @health-status-orange;
+  }
 }
 
 .alert-state-single-host {
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 6b38255..96bfd7b 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -880,7 +880,7 @@ a:focus {
   }
 
   .col-md-3 {
-    min-height: 80px;
+    min-height: 70px;
     margin-left: 2px;
     min-width: 180px;
   }
diff --git a/ambari-web/app/styles/bootstrap_overrides.less 
b/ambari-web/app/styles/bootstrap_overrides.less
index e3720bd..e8e7cc2 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -434,6 +434,12 @@ select.form-control {
   line-height: 1.3em;
 }
 
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.sub-menu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu {
+  padding: 5px 0;
+  background-color: #323544;
+}
+
 input[type="checkbox"]:checked + label:after {
   line-height: 2em;
 }
diff --git a/ambari-web/app/templates/main/service/menu_item.hbs 
b/ambari-web/app/templates/main/service/menu_item.hbs
index 72280d0..34242a9 100644
--- a/ambari-web/app/templates/main/service/menu_item.hbs
+++ b/ambari-web/app/templates/main/service/menu_item.hbs
@@ -24,7 +24,7 @@
     <i rel="tooltip" {{bindAttr class=":icon-medkit :passive-state-service 
view.content.isInPassive::hidden" }} {{translateAttr 
data-original-title="services.service.summary.inMaintenanceMode.tooltip"}}></i>
   </span>
   {{#if view.content.alertsCount}}
-    <span {{bindAttr class=":icon-circle 
view.hasCriticalAlerts:service-alerts-critical:service-alerts-warning"}}></span>
+    <i {{bindAttr class=":icon-circle :status-icon 
view.hasCriticalAlerts:service-alerts-critical:service-alerts-warning"}}></i>
   {{/if}}
   <span {{bindAttr class="view.isClientOnlyService:client-only-service 
:menu-item-name view.content.workStatus" 
data-original-title="view.content.toolTipContent"}} rel="serviceHealthTooltip">
       {{unbound view.content.displayName}}

-- 
To stop receiving notification emails like this one, please contact
atk...@apache.org.

Reply via email to