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 23:10:39 UTC
[1/2] git commit: updated refs/heads/ui-restyle to f302c86
Updated Branches:
refs/heads/ui-restyle a78f5253a -> f302c8685
Add slider control
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bffb10ab
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bffb10ab
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bffb10ab
Branch: refs/heads/ui-restyle
Commit: bffb10ab862901a9999ccb0deab63ad5fef62c9e
Parents: a78f525
Author: Brian Federle <br...@citrix.com>
Authored: Wed Oct 9 13:59:40 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Oct 9 13:59:40 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/csui/_csui.scss | 3 ++-
ui/stylesheets/csui/_slider.scss | 46 +++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bffb10ab/ui/stylesheets/csui/_csui.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_csui.scss b/ui/stylesheets/csui/_csui.scss
index 9a067e9..63d22ea 100644
--- a/ui/stylesheets/csui/_csui.scss
+++ b/ui/stylesheets/csui/_csui.scss
@@ -74,4 +74,5 @@ html, body {
@import "toolbar";
@import "breadcrumbs";
@import "action";
-@import "wizard";
\ No newline at end of file
+@import "wizard";
+@import "slider";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bffb10ab/ui/stylesheets/csui/_slider.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_slider.scss b/ui/stylesheets/csui/_slider.scss
new file mode 100644
index 0000000..c3d47a4
--- /dev/null
+++ b/ui/stylesheets/csui/_slider.scss
@@ -0,0 +1,46 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+@mixin csui-slider-area {
+ @include linear-gradient(#656565, #aeaeae);
+
+ box-shadow: inset 0px 0px 4px black;
+ width: 100%;
+ height: 25px;
+ margin: 20px;
+ border-radius: 3px;
+}
+
+@mixin csui-slider-handle {
+ @include linear-gradient(#ffffff, #c4c4c4);
+
+ border: 1px solid #2f2f2f;
+ display: block;
+ width: 30px;
+ height: 25px;
+ position: relative;
+ border-radius: 3px;
+ padding: 0;
+}
+
+// jQuery UI defaults
+.ui-slider {
+ @include csui-slider-area;
+}
+
+.ui-slider-handle {
+ @include csui-slider-handle;
+}
[2/2] git commit: updated refs/heads/ui-restyle to f302c86
Posted by bf...@apache.org.
Style data disk offering step
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f302c868
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f302c868
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f302c868
Branch: refs/heads/ui-restyle
Commit: f302c86855c7923e0ee9ae335cd19afb4f627050
Parents: bffb10a
Author: Brian Federle <br...@citrix.com>
Authored: Wed Oct 9 14:10:34 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Oct 9 14:10:34 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/_instance-wizard.scss | 34 +++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f302c868/ui/stylesheets/_instance-wizard.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/_instance-wizard.scss b/ui/stylesheets/_instance-wizard.scss
index 42460c8..0797d38 100644
--- a/ui/stylesheets/_instance-wizard.scss
+++ b/ui/stylesheets/_instance-wizard.scss
@@ -75,4 +75,38 @@
}
}
}
+
+ .step.data-disk-offering {
+ &.custom-disk-size {
+ .select-container {
+ height: 200px;
+ }
+ }
+
+ .section.custom-size {
+ label:not(.size) {
+ @include span-columns(12);
+ }
+
+ label.size {
+ text-align: center;
+ margin-top: 20px;
+ float: left;
+ }
+
+ .ui-slider {
+ @include span-columns(7);
+ }
+
+ input[type=text] {
+ @include shift(2);
+
+ padding: 5px;
+ float: left;
+ margin-right: 25px;
+ }
+
+ margin-top: 20px;
+ }
+ }
}
\ No newline at end of file