Repository: ambari Updated Branches: refs/heads/trunk aeff76e14 -> 930cbc22e
AMBARI-8117 Slider App - App details page components view requires auto scroll. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/930cbc22 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/930cbc22 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/930cbc22 Branch: refs/heads/trunk Commit: 930cbc22e448b743e6e4480e28edec186f1c47b9 Parents: aeff76e Author: Andrii Tkach <[email protected]> Authored: Mon Nov 3 20:18:34 2014 +0200 Committer: Andrii Tkach <[email protected]> Committed: Mon Nov 3 20:18:34 2014 +0200 ---------------------------------------------------------------------- contrib/views/slider/src/main/resources/ui/app/styles/app.less | 5 ++--- .../src/main/resources/ui/app/views/slider_app/summary_view.js | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/930cbc22/contrib/views/slider/src/main/resources/ui/app/styles/app.less ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/app.less b/contrib/views/slider/src/main/resources/ui/app/styles/app.less index 7b6f36a..eb8eceb 100644 --- a/contrib/views/slider/src/main/resources/ui/app/styles/app.less +++ b/contrib/views/slider/src/main/resources/ui/app/styles/app.less @@ -88,9 +88,8 @@ .icon-warning-sign { color: #ff0000; } - .panel-body{ - /*max-height: 400px; - overflow-x: auto;*/ + .panel-body { + overflow-y: auto; } } .panel-link { http://git-wip-us.apache.org/repos/asf/ambari/blob/930cbc22/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js index 9c92b16..90631fd 100644 --- a/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js +++ b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js @@ -126,13 +126,14 @@ App.SliderAppSummaryView = Ember.View.extend({ panelSummaryBody = panelSummary.find('.panel-body'), columnRight = this.$('.column-right'), panelAlerts = columnRight.find('.panel-alerts'), - panelComponents = columnRight.find('.panel-components'); + panelComponentsBody = columnRight.find('.panel-components .panel-body'), + wrapperHeightDiff = columnRight.find('.panel-components').height() - panelComponentsBody.height(); if (panelSummary.height() < panelSummaryBody.height()) { panelSummary.height(panelSummaryBody.height()); } var marginAndBorderHeight = parseInt(panelAlerts.css('margin-bottom')) + 3; if (panelSummary.height() > columnRight.height()) { - panelComponents.height(panelSummary.height() - panelAlerts.height() - marginAndBorderHeight); + panelComponentsBody.height(panelSummary.height() - panelAlerts.height() - marginAndBorderHeight - wrapperHeightDiff); } else { panelSummary.height(columnRight.height() - marginAndBorderHeight);
