ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-18114. Overlap on services dropdown menu (onechiporenko)
Date Thu, 11 Aug 2016 11:11:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 487acd147 -> 5dca158ed


AMBARI-18114. Overlap on services dropdown menu (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5dca158e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5dca158e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5dca158e

Branch: refs/heads/trunk
Commit: 5dca158ed803a8c32b9d3620112f3de8ab2e90e7
Parents: 487acd1
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Thu Aug 11 14:07:55 2016 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Thu Aug 11 14:11:50 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/styles/application.less    | 2 +-
 ambari-web/app/views/main/service/menu.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5dca158e/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 200c7be..2449443 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -309,7 +309,7 @@ footer {
         text-decoration: none;
         text-align: left;
         display: block;
-        padding: 3px 10px;
+        padding: 3px 0 3px 5px;
         clear: both;
         font-weight: normal;
         line-height: 20px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/5dca158e/ambari-web/app/views/main/service/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js
index f5768f8..2c9ac5c 100644
--- a/ambari-web/app/views/main/service/menu.js
+++ b/ambari-web/app/views/main/service/menu.js
@@ -170,7 +170,9 @@ App.TopNavServiceMenuView = Em.CollectionView.extend({
       return this.get('content.id') == this.get('parentView.activeServiceId') ? 'active'
: '';
     }.property('parentView.activeServiceId'),
 
-    alertsCount: Em.computed.alias('content.alertsCount'),
+    alertsCount: function () {
+      return this.get('content.alertsCount') > 99 ? "99+" : this.get('content.alertsCount')
;
+    }.property('content.alertsCount'),
 
     hasCriticalAlerts: Em.computed.alias('content.hasCriticalAlerts'),
 


Mime
View raw message