Repository: ambari Updated Branches: refs/heads/trunk dd0086cb9 -> 93b068c87
AMBARI-15626. Stack and Versions: redundant scrollbars in Version Details popup (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93b068c8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93b068c8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93b068c8 Branch: refs/heads/trunk Commit: 93b068c87a38bac297dd2210122beeabf7645db2 Parents: dd0086c Author: Alex Antonenko <[email protected]> Authored: Wed Mar 30 14:40:00 2016 +0300 Committer: Alex Antonenko <[email protected]> Committed: Wed Mar 30 15:12:21 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/stack_versions.less | 2 -- .../app/views/main/admin/stack_upgrade/upgrade_version_box_view.js | 2 +- .../views/main/admin/stack_upgrade/upgrade_version_column_view.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/93b068c8/ambari-web/app/styles/stack_versions.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less index a8a57d9..052ae4d 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -137,7 +137,6 @@ } } .version-box-in-popup.version-box { - width: 340px; padding: 0px 0px; margin: 0px 0px; border: none; @@ -175,7 +174,6 @@ position: relative; background: none repeat scroll 0 0 #fff; border: 1px solid #d2d9dd; - height: 190px; margin: 15px 15px 0 0; padding: 5px 0; a.not-active:hover { http://git-wip-us.apache.org/repos/asf/ambari/blob/93b068c8/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js index 67c26ed..ccee6bf 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js @@ -22,7 +22,7 @@ var stringUtils = require('utils/string_utils'); App.UpgradeVersionBoxView = Em.View.extend({ templateName: require('templates/main/admin/stack_upgrade/upgrade_version_box'), - classNames: ['span4', 'version-box'], + classNames: ['version-box'], classNameBindings: ['versionClass'], /** http://git-wip-us.apache.org/repos/asf/ambari/blob/93b068c8/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js index 251a23d..168e8db 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js @@ -22,7 +22,7 @@ var stringUtils = require('utils/string_utils'); App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({ templateName: require('templates/main/admin/stack_upgrade/upgrade_version_column'), isVersionColumnView: true, - classNames: ['version-column'], + classNames: ['version-column', 'span4'], didInsertElement: function () { App.tooltip($('.link-tooltip'), {title: Em.I18n.t('admin.stackVersions.version.linkTooltip')});
