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 CA6C9200BA1 for ; Mon, 17 Oct 2016 23:54:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C8FD5160AEC; Mon, 17 Oct 2016 21:54:02 +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 E3A08160AE2 for ; Mon, 17 Oct 2016 23:54:01 +0200 (CEST) Received: (qmail 81391 invoked by uid 500); 17 Oct 2016 21:54:01 -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 81382 invoked by uid 99); 17 Oct 2016 21:54:01 -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; Mon, 17 Oct 2016 21:54:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E734EE049D; Mon, 17 Oct 2016 21:54:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhewang@apache.org To: commits@ambari.apache.org Message-Id: <22fdc4e32da344f295ac46ff252e466c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17636 Service Configs page: can't see all config versions in dropdown (Vivek Ratnavel Subramanian via zhewang) Date: Mon, 17 Oct 2016 21:54:00 +0000 (UTC) archived-at: Mon, 17 Oct 2016 21:54:03 -0000 Repository: ambari Updated Branches: refs/heads/trunk d132ca173 -> 89d964e0e AMBARI-17636 Service Configs page: can't see all config versions in dropdown (Vivek Ratnavel Subramanian via zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/89d964e0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89d964e0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89d964e0 Branch: refs/heads/trunk Commit: 89d964e0e0e5b6285d82074207222220cd54888c Parents: d132ca1 Author: Zhe (Joe) Wang Authored: Mon Oct 17 14:53:16 2016 -0700 Committer: Zhe (Joe) Wang Committed: Mon Oct 17 14:53:16 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/config_history_flow.less | 31 ++++++++++++++----- .../common/configs/config_history_flow.hbs | 32 ++++++++++++-------- .../views/common/configs/config_history_flow.js | 3 +- 3 files changed, 44 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/89d964e0/ambari-web/app/styles/config_history_flow.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less index e2806ea..e4bb599 100644 --- a/ambari-web/app/styles/config_history_flow.less +++ b/ambari-web/app/styles/config_history_flow.less @@ -230,21 +230,38 @@ ul#dropdown_menu { position: absolute; - top: 0; left: 0; z-index: 1000; - float: left; min-width: 400px; - overflow: hidden; - overflow-y: scroll; padding: 5px 0; - margin: 5px 0; + margin: 0; } #dropdown_content { + overflow: hidden; + &::-webkit-scrollbar { + display: none; + } + } + + #dropdown_outer_container, #dropdown_menu_container { + min-width: 400px; height: 300px; + } + + #dropdown_outer_container { + position: relative; overflow: hidden; + } + + #dropdown_inner_container { + position: absolute; + left: 0; + overflow-x: hidden; overflow-y: scroll; + &::-webkit-scrollbar { + display: none; + } } .dropdown-menu { @@ -392,12 +409,12 @@ } // Firefox specific styles -body:not(:-moz-handler-blocked) { +@-moz-document url-prefix() { #config_history_flow { .version-info-bar { .dropdown-menu { li { - line-height: 30px; + line-height: 30px !important; } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/89d964e0/ambari-web/app/templates/common/configs/config_history_flow.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs index 59d6491..99a65a2 100644 --- a/ambari-web/app/templates/common/configs/config_history_flow.hbs +++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs @@ -82,20 +82,26 @@
- +
+ +
http://git-wip-us.apache.org/repos/asf/ambari/blob/89d964e0/ambari-web/app/views/common/configs/config_history_flow.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/config_history_flow.js b/ambari-web/app/views/common/configs/config_history_flow.js index 0674231..58de1e6 100644 --- a/ambari-web/app/views/common/configs/config_history_flow.js +++ b/ambari-web/app/views/common/configs/config_history_flow.js @@ -591,6 +591,7 @@ App.ConfigHistoryDropdownRowView = Em.View.extend({ var $el = $('#config_version_popup'); var $currentTarget = $(event.currentTarget); var parentView = view.get('parentView'); + parentView.set('hoveredServiceVersion', null); if (!serviceVersion.get("isDisplayed")) { parentView.set('hoveredServiceVersion', serviceVersion); parentView.set('isHovered', true); @@ -616,7 +617,6 @@ App.ConfigHistoryDropdownRowView = Em.View.extend({ parentView.set('isHovered', false); Em.run.later(function() { if(!parentView.get('displaySubMenuFlag') && !parentView.get('isHovered')) { - parentView.set('hoveredServiceVersion', null); $('#config_version_popup').removeAttr('style'); } }, 200); @@ -637,7 +637,6 @@ App.ConfigHistoryDropdownSubMenuView = Em.View.extend({ mouseLeave: function(event, view) { var parentView = view.get('parentView'); parentView.set('displaySubMenuFlag', false); - parentView.set('hoveredServiceVersion', null); $("#config_version_popup").removeAttr('style'); } })