You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/12 14:36:41 UTC
[02/26] ambari git commit: AMBARI-20978 Ambari 3.0: Outstanding new
components issues. (atkach)
AMBARI-20978 Ambari 3.0: Outstanding new components issues. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/506b8476
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/506b8476
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/506b8476
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 506b84768581311d944b57cbd270ee3b96613b65
Parents: 4595f00
Author: Andrii Tkach <at...@apache.org>
Authored: Wed May 10 13:36:40 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Wed May 10 17:44:35 2017 +0300
----------------------------------------------------------------------
.../app/styles/theme/bootstrap-ambari.css | 53 +++++++++++++-------
ambari-web/app/styles/wizard.less | 6 +++
2 files changed, 42 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/506b8476/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 3164584..7f95dab 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -212,6 +212,9 @@
background-color: #429929;
border: 1px solid #3FAE2A;
}
+.btn-success {
+ border: none;
+}
.btn-regular-default-state {
background-color: #FFF;
color: #666;
@@ -222,41 +225,52 @@
border: 1px solid #3FAE2A;
color: #FFF;
}
-.btn-group.open .btn.dropdown-toggle {
+.btn-group.open .btn.dropdown-toggle,
+.dropdown.open .btn.dropdown-toggle {
box-shadow: inset 0px 0px 3px 0px #1391c1;
}
.btn-group.open .btn.dropdown-toggle,
-.btn-group.open .btn.dropdown-toggle.btn-default {
+.dropdown.open .btn.dropdown-toggle,
+.btn-group.open .btn.dropdown-toggle.btn-default,
+.dropdown.open .btn.dropdown-toggle.btn-default {
background-color: #FFF;
color: #666;
border: 1px solid #cfd3d7;
}
.btn-group.open .btn.dropdown-toggle:hover,
-.btn-group.open .btn.dropdown-toggle.btn-default:hover {
+.dropdown.open .btn.dropdown-toggle:hover,
+.btn-group.open .btn.dropdown-toggle.btn-default:hover,
+.dropdown.open .btn.dropdown-toggle.btn-default:hover {
background-color: #FFF;
color: #666;
border: 1px solid #cfd3d7;
}
.btn-group.open .btn.dropdown-toggle + .dropdown-menu > li > a:hover,
-.btn-group.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover {
+.dropdown.open .btn.dropdown-toggle + .dropdown-menu > li > a:hover,
+.btn-group.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover,
+.dropdown.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover {
background-color: #808793;
color: #FFF;
}
-.btn-group.open .btn.dropdown-toggle.btn-primary {
+.btn-group.open .btn.dropdown-toggle.btn-primary,
+.dropdown.open .btn.dropdown-toggle.btn-primary {
background-color: #3FAE2A;
border: 1px solid #3FAE2A;
color: #FFF;
}
-.btn-group.open .btn.dropdown-toggle.btn-primary:hover {
+.btn-group.open .btn.dropdown-toggle.btn-primary:hover,
+.dropdown.open .btn.dropdown-toggle.btn-primary:hover {
background-color: #3FAE2A;
border: 1px solid #3FAE2A;
color: #FFF;
}
-.btn-group.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover {
+.btn-group.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover,
+.dropdown.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover {
background-color: #429929;
color: #FFF;
}
-.btn-group.open .dropdown-menu {
+.btn-group.open .dropdown-menu,
+.dropdown.open .dropdown-menu {
font-family: 'Roboto', sans-serif;
font-weight: normal;
font-style: normal;
@@ -269,17 +283,22 @@
color: #666;
border: 1px solid #cfd3d7;
}
-.btn-group.open .dropdown-menu > li {
+.btn-group.open .dropdown-menu > li,
+.dropdown.open .dropdown-menu > li {
margin-bottom: 1px;
}
-.btn-group.open .dropdown-menu > li > a {
+.btn-group.open .dropdown-menu > li > a,
+.dropdown.open .dropdown-menu > li > a {
height: 24px;
}
-.btn-group .btn.dropdown-toggle:first-child {
+.btn-group .btn.dropdown-toggle:first-child,
+.dropdown .btn.dropdown-toggle:first-child {
min-width: 80px;
}
.btn-group .btn.dropdown-toggle.disabled,
-.btn-group .btn.dropdown-toggle[disabled] {
+.dropdown .btn.dropdown-toggle.disabled,
+.btn-group .btn.dropdown-toggle[disabled],
+.dropdown .btn.dropdown-toggle[disabled] {
opacity: 0.6;
}
input.form-control {
@@ -347,9 +366,9 @@ input.form-control:focus {
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
- color: #dbdee2;
- border-color: #b2b8c1;
- background-color: #b2b8c1;
+ color: #999999;
+ border-color: #cccccc;
+ background-color: #dddddd;
}
h2.table-title {
font-family: 'Roboto', sans-serif;
@@ -703,7 +722,7 @@ input[type="checkbox"] + label:before {
content: '';
position: absolute;
left: 0;
- top: 2px;
+ top: 4px;
width: 10px;
height: 10px;
box-sizing: border-box;
@@ -716,7 +735,7 @@ input[type="checkbox"]:checked + label:after {
content: '\2714';
color: #FFF;
position: absolute;
- top: 2px;
+ top: 0;
left: 2px;
font-size: 9px;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/506b8476/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 130896dd..407d965 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -199,6 +199,12 @@
color: #00688B;
}
}
+ #step4 {
+ .checkbox > div {
+ line-height: 1.3em;
+ font-size: initial;
+ }
+ }
#step6 {
.pre-scrollable {
max-height: 440px;