You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/01/30 15:40:27 UTC
[06/30] ambari git commit: AMBARI-19754. Remove white border from the
content area in popup wizards.(xiwang)
AMBARI-19754. Remove white border from the content area in popup wizards.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3391f0d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3391f0d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3391f0d
Branch: refs/heads/branch-dev-patch-upgrade
Commit: b3391f0dd030130add23b9ffb09fb7a776dfe969
Parents: 9d8a54c
Author: Xi Wang <xi...@apache.org>
Authored: Fri Jan 27 11:16:49 2017 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Jan 27 14:22:02 2017 -0800
----------------------------------------------------------------------
ambari-web/app/styles/modal_popups.less | 42 +++++++++++++++++++-
.../views/common/modal_popups/log_tail_popup.js | 2 +-
.../admin/stack_upgrade/upgrade_history_view.js | 2 +-
3 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/styles/modal_popups.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/modal_popups.less b/ambari-web/app/styles/modal_popups.less
index c10ef30..a6a0196 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -81,10 +81,14 @@
margin: 0;
}
-/*90% width modal window start*/
+/*90% width wizard modal window start*/
.wizard-modal-wrapper {
.modal {
.modal-body {
+ padding: 0;
+ .wizard {
+ border: none;
+ }
div.error {
color: #b94a48;
.help-block {
@@ -114,8 +118,42 @@
}
}
+/*90% width wizard modal window end*/
+
+/*90% width modal (non-wizard) window start*/
+
+.wide-modal-wrapper {
+ .modal {
+ .modal-body {
+ div.error {
+ color: #b94a48;
+ .help-block {
+ color: #b94a48;
+ }
+ }
+
+ div.error input{
+ border-color: #b94a48;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ }
+ }
+ }
+
+ .content {
+ padding: 0;
+ }
-/*90% width modal window end*/
+ //fix stripped in inner table
+ .table-striped tbody tr:nth-child(odd)
+ td .table-striped tbody
+ tr:nth-child(odd) td,
+ tr:nth-child(even) th {
+ background-color: transparent;
+ }
+}
+/*90% width modal window (non-wizard) end*/
/*700px width modal window start*/
.modal-690px-width {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/views/common/modal_popups/log_tail_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/modal_popups/log_tail_popup.js b/ambari-web/app/views/common/modal_popups/log_tail_popup.js
index 1e6924f..6510ac9 100644
--- a/ambari-web/app/views/common/modal_popups/log_tail_popup.js
+++ b/ambari-web/app/views/common/modal_popups/log_tail_popup.js
@@ -22,7 +22,7 @@ var fileUtils = require('utils/file_utils');
App.showLogTailPopup = function(content) {
return App.ModalPopup.show({
- classNames: ['log-tail-popup', 'wizard-modal-wrapper', 'full-height-modal'],
+ classNames: ['log-tail-popup', 'wide-modal-wrapper', 'full-height-modal'],
modalDialogClasses: ['modal-xlg'],
header: fileUtils.fileNameFromPath(content.get('filePath')),
primary: false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
index c4a428e..aeee96e 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
@@ -297,7 +297,7 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
this.get('controller').set('currentUpgradeRecord', record);
App.ModalPopup.show({
- classNames: ['wizard-modal-wrapper'],
+ classNames: ['wide-modal-wrapper'],
modalDialogClasses: ['modal-xlg'],
header: Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(displayName, direction, toVersion),
bodyClass: App.MainAdminStackUpgradeHistoryDetailsView,