You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2016/12/07 01:26:11 UTC
ambari git commit: AMBARI-19099. Improve and Fix 'Wizard pages' after
new guidelines. (xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk a62119ab9 -> 1e261db06
AMBARI-19099. Improve and Fix 'Wizard pages' after new guidelines. (xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e261db0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e261db0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e261db0
Branch: refs/heads/trunk
Commit: 1e261db06128143a4e631aff899704cf12709413
Parents: a62119a
Author: Xi Wang <xi...@apache.org>
Authored: Mon Dec 5 16:01:52 2016 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Dec 6 17:25:21 2016 -0800
----------------------------------------------------------------------
.../app/styles/theme/bootstrap-ambari.css | 25 +++++++++++---------
ambari-web/app/styles/wizard.less | 13 ++++++++--
ambari-web/app/templates/wizard/step8.hbs | 2 +-
3 files changed, 26 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e261db0/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 738fa59..5a641b3 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -510,19 +510,15 @@ h2.table-title {
margin: 15px 20px;
}
.wizard .wizard-body {
- background: #ebecf1;
- /* Old browsers */
- background: -moz-linear-gradient(to right, #323544, #323544 25%, #ebecf1 25%, #ebecf1);
- /* FF3.6-15 */
- background: -webkit-linear-gradient(to right, #323544, #323544 25%, #ebecf1 25%, #ebecf1);
- /* Chrome10-25,Safari5.1-6 */
- background: linear-gradient(to right, #323544, #323544 25%, #ebecf1 25%, #ebecf1);
- /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+ overflow: hidden;
margin: 0;
}
.wizard .wizard-body .wizard-content {
background: #ebecf1;
padding-top: 25px;
+ float: left;
+ margin-bottom: -99999px;
+ padding-bottom: 99999px;
}
.wizard .wizard-body .wizard-content .step-title {
font-family: 'Roboto', sans-serif;
@@ -554,6 +550,9 @@ h2.table-title {
min-height: 650px;
padding-top: 25px;
background-color: #323544;
+ float: left;
+ margin-bottom: -99999px;
+ padding-bottom: 99999px;
}
.wizard .wizard-body .wizard-nav .nav li {
padding: 10px 0;
@@ -588,6 +587,9 @@ h2.table-title {
color: #bbbbbb;
margin-left: 30px;
}
+.wizard .wizard-body .wizard-nav .nav li .step-index {
+ line-height: 18px;
+}
.wizard .wizard-body .wizard-nav .nav li .step-description {
font-family: 'Roboto', sans-serif;
font-weight: normal;
@@ -602,7 +604,7 @@ h2.table-title {
background-color: #1EB475;
color: white;
font-size: 10px;
- padding-left: 3px;
+ padding-left: 2px;
}
.wizard .wizard-body .wizard-nav .nav li.completed .step-marker .step-index {
display: none;
@@ -634,8 +636,9 @@ h2.table-title {
border-color: #bbbbbb;
}
.wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
- background-color: #bbbbbb;
- color: #323544;
+ background-color: #1EB475;
+ border: 2px solid #1EB475;
+ color: white;
}
.wizard .wizard-body .wizard-nav .nav-pills > li.active > a,
.wizard .wizard-body .wizard-nav .nav-pills > li.active > a:focus,
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e261db0/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 57dae45..9920319 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -36,7 +36,6 @@
padding-right: 15px;
}
.btn-area {
- margin-top: 20px;
.btn.btn-info {
margin-right: 10px;
}
@@ -433,7 +432,7 @@
color: #fff;
cursor: pointer;
font-weight: bold;
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ line-height: 16px;
&:hover {
background-color: @green;
}
@@ -471,6 +470,12 @@
ul {
li {
list-style: none;
+ span.text {
+ line-height: 1.5;
+ }
+ b.service-name {
+ line-height: 2;
+ }
}
}
max-height: 440px;
@@ -490,6 +495,10 @@
ul {
li {
list-style: none;
+ span.text-info,
+ span.text-success {
+ line-height: 1.5;
+ }
}
}
max-height: 440px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e261db0/ambari-web/app/templates/wizard/step8.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs
index 5c2e8e6..9e50e30 100644
--- a/ambari-web/app/templates/wizard/step8.hbs
+++ b/ambari-web/app/templates/wizard/step8.hbs
@@ -63,7 +63,7 @@
<ul>
{{#each controller.services}}
<li>
- <em><b>{{display_name}}</b></em>
+ <em><b class="service-name">{{display_name}}</b></em>
<ul>
{{#each component in this.service_components}}
<li>