cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/4.4 to 40cf807
Date Tue, 25 Mar 2014 18:43:40 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 e0863281a -> 40cf807bd


CLOUDSTACK-6170 (fixing a GUI formatting issue)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40cf807b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40cf807b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40cf807b

Branch: refs/heads/4.4
Commit: 40cf807bd96319f37e554e81cd13a381d437e883
Parents: e086328
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Tue Mar 25 11:37:44 2014 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Tue Mar 25 12:42:59 2014 -0600

----------------------------------------------------------------------
 ui/css/cloudstack3.css | 24 ++++++++++++++++++++++--
 ui/index.jsp           |  3 +++
 2 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40cf807b/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 4aab13b..f5582b6 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5988,7 +5988,7 @@ label.error {
 }
 
 .multi-wizard.instance-wizard .data-disk-offering .select-container {
-  height: 280px;
+  height: 300px;
   margin: -7px 6px 0 8px;
   /*+border-radius:6px;*/
   -moz-border-radius: 6px;
@@ -6093,8 +6093,28 @@ label.error {
   font-size: 10px;
 }
 
+.instance-wizard .step.data-disk-offering.custom-disk-size .select-container {
+  height: 272px;
+}
+
 .instance-wizard .step.data-disk-offering.custom-iops-do .select-container {
-  height: 165px;
+  height: 240px;
+}
+
+.instance-wizard .step.data-disk-offering.custom-disk-size.custom-iops-do .select-container
{
+  height: 176px;
+}
+
+.instance-wizard .step.data-disk-offering.required.custom-disk-size .select-container {
+  height: 315px;
+}
+
+.instance-wizard .step.data-disk-offering.required.custom-iops-do .select-container {
+  height: 295px;
+}
+
+.instance-wizard .step.data-disk-offering.required.custom-disk-size.custom-iops-do .select-container
{
+  height: 223px;
 }
 
 .instance-wizard .step.data-disk-offering .custom-iops-do {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40cf807b/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 96cfeb5..dce2aa8 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -206,6 +206,7 @@
                             <div class="content">
                                 <div class="select-container">
                                 </div>
+
                                 <!-- Custom size slider -->
                                 <div class="section custom-size">
                                     <div class="field">
@@ -221,6 +222,7 @@
                                         <input type="text" class="required disallowSpecialCharacters"
name="compute-memory" />
                                     </div>
                                 </div>
+
                                 <!-- Custom iops -->
                                 <div class="section custom-iops">
                                     <div class="field">
@@ -259,6 +261,7 @@
                                     <input type="text" class="required digits" name="size"
value="1" />
                                     <label class="size">GB</label>
                                 </div>
+
                                 <!-- Custom iops -->
                                 <div class="section custom-iops-do">
                                     <div class="field">


Mime
View raw message