You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/09 00:10:23 UTC
[6/6] git commit: updated refs/heads/ui-restyle to b1cac7a
Instance wizard: style progress state
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b1cac7a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b1cac7a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b1cac7a1
Branch: refs/heads/ui-restyle
Commit: b1cac7a1331def367b08309d2acac58abd206ce3
Parents: 0555a52
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 15:10:14 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 15:10:14 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/instanceWizard.js | 6 ++++-
ui/stylesheets/csui/_wizard.scss | 40 +++++++++++++++++++++++------
2 files changed, 37 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1cac7a1/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 2b111f5..a88d4c3 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -850,9 +850,13 @@
// Update progress bar
var $targetProgress = $progress.removeClass('active').filter(function() {
- return $(this).index() <= targetIndex;
+ return $(this).index() === targetIndex;
}).toggleClass('active');
+ $progress.removeClass('done').filter(function() {
+ return $(this).index() < $targetProgress.index();
+ }).toggleClass('done');
+
// Update diagram; show/hide as necessary
$diagramParts.filter(function() {
return $(this).index() <= targetIndex;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1cac7a1/ui/stylesheets/csui/_wizard.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_wizard.scss b/ui/stylesheets/csui/_wizard.scss
index 536a421..3bc74d7 100644
--- a/ui/stylesheets/csui/_wizard.scss
+++ b/ui/stylesheets/csui/_wizard.scss
@@ -24,24 +24,48 @@
.progress {
@include span-columns(3);
- border: 1px solid #ccc;
- border-radius: 6px;
- box-shadow: inset 0px 0px 20px #ccc;
+ border-right: 1px solid #ccc;
+ box-shadow: 2px -1px 5px #ccc;
ul {
padding: 5px 0 0 20px;
li {
list-style: none;
margin-top: 10px;
+ color: gray;
+
+ .number {
+ padding: 0 6px;
+ border-radius: 100%;
+ font-size: 14px;
+ margin-right: 10px;
+ text-shadow: 0px 0px 1px black;
+ color: white;
+ background: #ccc;
+ }
&.active {
- font-weight: bold;
+ color: black;
+
+ .number {
+ @include radial-gradient(circle at 90% 10%, darken(#ccc, 15%), darken(#ccc, 45%));
+ }
}
- .number {
- font-size: 18px;
- margin-right: 10px;
- color: lighten(black, 25%);
+ &.done {
+ color: black;
+
+ &:before {
+ @include icon($ok);
+
+ margin: 0 10px 0px 5px;
+ font-size: 14px;
+ color: green;
+ }
+
+ .number {
+ display: none;
+ }
}
}
}