ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject [2/2] ambari git commit: AMBARI-19305. Improve and Fix 'Services page' after new guidelines.(xiwang)
Date Wed, 28 Dec 2016 22:17:29 GMT
AMBARI-19305. Improve and Fix 'Services page' after new guidelines.(xiwang)


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

Branch: refs/heads/trunk
Commit: a2c907b2d9c2da58c7907e0ee9a3b5ad5376f361
Parents: 74d6363
Author: Xi Wang <xiwang@apache.org>
Authored: Tue Dec 27 18:44:57 2016 -0800
Committer: Xi Wang <xiwang@apache.org>
Committed: Wed Dec 28 13:52:53 2016 -0800

----------------------------------------------------------------------
 .../app/styles/enhanced_service_dashboard.less  | 40 +++++++++++++++++++-
 .../service/widgets/create/expression_view.js   |  1 +
 2 files changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c907b2/ambari-web/app/styles/enhanced_service_dashboard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less b/ambari-web/app/styles/enhanced_service_dashboard.less
index 0d549d7..dfbe042 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -180,6 +180,8 @@
 
 #widget-preview {
   max-width: 200px;
+  margin: auto;
+  margin-bottom: 20px;
   .widget {
     .img-thumbnail .corner-icon {
       display: none;
@@ -475,12 +477,46 @@
 }
 
 .add-metric-menu{
-  .select-options-dropdown {
+  .dropdown-menu.select-options-dropdown {
     width: 240px;
-    border: none;
+    padding: 0px;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding;
+    background-clip: padding-box;
+    border-bottom: 250px transparent solid;
+    border-left: none;
+    border-right: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
     &>li>div {
       padding: 3px;
     }
+    li.metric-select {
+      padding: 5px;
+      padding-bottom: 0px;
+      border-left: 1px #ccc solid;
+      border-right: 1px #ccc solid;
+      border-bottom: none;
+      border-top: none;
+    }
+    li.aggregator-select {
+      padding: 5px;
+      padding-bottom: 0px;
+      border-left: 1px #ccc solid;
+      border-right: 1px #ccc solid;
+      border-bottom: none;
+      border-top: none;
+    }
+    li.actions-buttons{
+      padding: 5px;
+      padding-left: 8px;
+      border: 1px #ccc solid;
+      border-top: none;
+      button {
+        margin-right: 5px;
+      }
+    }
   }
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c907b2/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 436e3e9..c4a1a3e 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -266,6 +266,7 @@ App.AddMetricExpressionView = Em.View.extend({
     var component = this.get('componentMap').findProperty('serviceName', event.context.get('serviceName'))
       .get('components').findProperty('id', event.context.get('id'));
     this.set('currentSelectedComponent', component);
+    event.stopPropagation();
   },
 
   /**


Mime
View raw message