Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A7A6D200BFA for ; Wed, 28 Dec 2016 23:17:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A648D160B2A; Wed, 28 Dec 2016 22:17:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EECC2160B2E for ; Wed, 28 Dec 2016 23:17:29 +0100 (CET) Received: (qmail 38324 invoked by uid 500); 28 Dec 2016 22:17:29 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 38315 invoked by uid 99); 28 Dec 2016 22:17:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2016 22:17:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E8702DFA98; Wed, 28 Dec 2016 22:17:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xiwang@apache.org To: commits@ambari.apache.org Date: Wed, 28 Dec 2016 22:17:29 -0000 Message-Id: <3484096fcd1a467d9b0523bea5b25cab@git.apache.org> In-Reply-To: <8abe69cc897e428c8ea59ead3defc7ed@git.apache.org> References: <8abe69cc897e428c8ea59ead3defc7ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-19305. Improve and Fix 'Services page' after new guidelines.(xiwang) archived-at: Wed, 28 Dec 2016 22:17:30 -0000 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 Authored: Tue Dec 27 18:44:57 2016 -0800 Committer: Xi Wang 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(); }, /**