cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [3/3] git commit: updated refs/heads/ui-restyle to f099739
Date Mon, 23 Sep 2013 23:11:47 GMT
Style header control elements


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

Branch: refs/heads/ui-restyle
Commit: f099739db1975f03f7b4ddeb8e17bc421ed9b435
Parents: 00152a2
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Sep 23 16:11:23 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Sep 23 16:11:23 2013 -0700

----------------------------------------------------------------------
 ui/stylesheets/cloudstack.scss   | 50 ++++++++++++++++++++++++++++++++++-
 ui/stylesheets/csui/_form.scss   |  8 +++++-
 ui/stylesheets/csui/_header.scss |  5 ++--
 3 files changed, 58 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f099739d/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 30aaf08..b11f7d4 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -28,7 +28,7 @@ body {
         float: right;
         margin-right: 20px;
         padding-right: 20px;
-        top: -125%;
+        top: -65px;
     }
 
     .notifications {
@@ -50,6 +50,54 @@ body {
         display: none !important;
     }
 
+    .project-switcher {
+        @include span-columns(3);
+        @include row;
+        
+        padding: 5px;
+        top: 10px;
+
+        label {
+            @include csui-label;
+            @include span-columns(3);
+        }
+        
+        select {
+            @include csui-dropdown;
+            @include span-columns(8);
+        }
+    }
+
+    .region-switcher {
+        @include span-columns(2);
+        @include row;
+
+        height: 100%;
+        cursor: pointer;
+        padding: 5px;
+
+        &:hover {
+            box-shadow: inset 0px 0px 10px black;
+            border-radius: 3px;
+        }
+        
+        .icon {
+            @include span-columns(3 of 16);
+            @include csui-sprite(142, 390);
+            
+            height: 30px;
+        }
+        
+        .title {
+            @include span-columns(11 of 16);
+            @include shift(1);
+            @include csui-label;
+            
+            text-align: left;
+;
+        }
+    }
+
     #user {
         background: url(csui/img/form/dropdown-arrow-white.png) no-repeat right;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f099739d/ui/stylesheets/csui/_form.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_form.scss b/ui/stylesheets/csui/_form.scss
index 15ab362..f3cd425 100644
--- a/ui/stylesheets/csui/_form.scss
+++ b/ui/stylesheets/csui/_form.scss
@@ -28,4 +28,10 @@
   color: white;
   font-weight: bold;
   text-shadow: 0px 1px 1px black;
-}
\ No newline at end of file
+}
+
+@mixin csui-label {
+    font-size: 14px;
+    position: relative;
+    top: 7px;
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f099739d/ui/stylesheets/csui/_header.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_header.scss b/ui/stylesheets/csui/_header.scss
index b6d378d..cadfc41 100644
--- a/ui/stylesheets/csui/_header.scss
+++ b/ui/stylesheets/csui/_header.scss
@@ -9,7 +9,7 @@
   .logo {
     background: url(csui/img/logo-main.png) no-repeat left;
     width: 1280px;
-    height: 100px;
+    height: 80px;
     margin: auto;
     background-size: 300px;
   }
@@ -19,8 +19,7 @@
     @include row;
 
     width: 1280px;
-    height: 75px;
-    padding-top: 14px;
+    padding: 15px;
     margin: auto;
     color: white;
     border: 1px solid gray;


Mime
View raw message