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/11/13 16:57:27 UTC
[10/51] [abbrv] ambari git commit: AMBARI-22354 Service Action Menu
issues. (atkach)
AMBARI-22354 Service Action Menu issues. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b020cd9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b020cd9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b020cd9
Branch: refs/heads/branch-feature-AMBARI-21674
Commit: 1b020cd98e8aca05097a8a829927e2d0415d480c
Parents: b8f7369
Author: Andrii Tkach <at...@apache.org>
Authored: Fri Nov 3 12:48:55 2017 +0200
Committer: Andrii Tkach <at...@apache.org>
Committed: Fri Nov 3 12:48:55 2017 +0200
----------------------------------------------------------------------
.../app/styles/theme/bootstrap-ambari.css | 35 +++++++++++++++-----
.../admin/kerberos/step2_controller_test.js | 2 +-
.../vendor/scripts/theme/bootstrap-ambari.js | 7 ----
3 files changed, 28 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b020cd9/ambari-web/app/styles/theme/bootstrap-ambari.css
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 7d1ad61..e85bb32 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -537,20 +537,27 @@ h2.table-title {
}
.wizard .wizard-body .wizard-content {
background: #ebecf1;
- padding-top: 25px;
+ padding-top: 15px;
float: left;
margin-bottom: -99999px;
padding-bottom: 99999px;
}
+.wizard .wizard-body .wizard-content .step-header {
+ font-family: 'Roboto', sans-serif;
+ font-weight: normal;
+ color: #666;
+ font-size: 14px;
+ font-style: normal;
+ line-height: 1;
+ margin-bottom: 5px;
+}
.wizard .wizard-body .wizard-content .step-title {
font-family: 'Roboto', sans-serif;
font-weight: normal;
font-style: normal;
line-height: 1;
color: #333;
- font-weight: bold;
- font-size: 18px;
- color: #666;
+ font-size: 16px;
}
.wizard .wizard-body .wizard-content .step-description {
font-family: 'Roboto', sans-serif;
@@ -558,7 +565,7 @@ h2.table-title {
font-style: normal;
line-height: 1;
color: #333;
- font-size: 14px;
+ font-size: 12px;
line-height: 1.4;
color: #999;
}
@@ -568,7 +575,7 @@ h2.table-title {
margin-top: 20px;
}
.wizard .wizard-body .wizard-content .panel.panel-default .panel-body {
- padding: 30px 20px;
+ padding: 10px 20px;
}
.wizard .wizard-body .wizard-nav {
min-height: 550px;
@@ -1042,16 +1049,28 @@ input.radio:checked + label:after {
}
.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a,
.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a {
- color: #666;
+ color: #333;
}
.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a i,
.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a i {
- color: #666;
+ color: #333;
}
.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a:hover,
.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a:hover {
background: #f5f5f5;
}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a.disabled,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a.disabled {
+ color: #666;
+}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a.disabled i,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a.disabled i {
+ color: #666;
+}
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a.disabled:hover,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a.disabled:hover {
+ background: #f5f5f5;
+}
.navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
.navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
display: inline-block;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b020cd9/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
index 794fe4a..a9103a8 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step2_controller_test.js
@@ -451,7 +451,7 @@ describe('App.KerberosWizardStep2Controller', function() {
});
it("ipa type configs", function() {
- var configs = [{name: 'group'}];
+ var configs = [{name: 'ipa_user_group'}];
controller.setConfigVisibility('ipa', configs, Em.I18n.t('admin.kerberos.wizard.step1.option.ipa'));
expect(configs[0].isVisible).to.be.true;
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b020cd9/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
----------------------------------------------------------------------
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 5fd713a..6102bc3 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -158,13 +158,6 @@ $(document).ready(function () {
});
});
}
- $dropdownMenu.on('click', function () {
- // some action was triggered, should hide this icon
- var moreIcon = $(this).parent();
- setTimeout(function () {
- moreIcon.hide();
- }, 1000);
- });
$navigationContainer.children('.side-nav-menu').scroll(function () {
$moreActions.removeClass('open');
});