cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/ui-restyle to deefb7e
Date Tue, 24 Sep 2013 19:58:13 GMT
Updated Branches:
  refs/heads/ui-restyle 6e2c58b28 -> deefb7e4f


Fix compatibility

-Don't use background size; make separately-sized images

-Have fallback flat color for layered and gradient backgrounds


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

Branch: refs/heads/ui-restyle
Commit: deefb7e4f115de075eebd169f18d78d3b69e3aba
Parents: 6e2c58b
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Sep 24 12:58:04 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Sep 24 12:58:04 2013 -0700

----------------------------------------------------------------------
 ui/stylesheets/cloudstack.scss               |   4 ++--
 ui/stylesheets/csui/_button.scss             |   1 +
 ui/stylesheets/csui/_form.scss               |   3 +++
 ui/stylesheets/csui/_header.scss             |   4 +++-
 ui/stylesheets/csui/_login.scss              |   9 +++++----
 ui/stylesheets/csui/img/header/logo.png      | Bin 0 -> 5828 bytes
 ui/stylesheets/csui/img/login/brand-logo.png | Bin 34193 -> 28868 bytes
 ui/stylesheets/csui/img/login/logo.png       | Bin 0 -> 22018 bytes
 ui/stylesheets/csui/img/logo-main.png        | Bin 26591 -> 0 bytes
 9 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 19dd35c..ca56579 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -36,13 +36,13 @@ body {
 
         .total {
             padding: 5px 10px;
-            @include linear-gradient(lightgray, lighten(black, 15%));
+            @include linear-gradient(#a4a4a4, lighten(#272727, 15%));
             border-radius: 1px;
             margin-top: -5px;
             margin-right: 20px;
             float: left;
             border-radius: 8px;
-            text-shadow: 0px 1px 1px black;
+            text-shadow: 0px 2px 2px black;
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/_button.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_button.scss b/ui/stylesheets/csui/_button.scss
index 2d62a44..a857b09 100644
--- a/ui/stylesheets/csui/_button.scss
+++ b/ui/stylesheets/csui/_button.scss
@@ -20,6 +20,7 @@
   @include csui-button;
   @include linear-gradient(darkgray, lighten(black, 15%));
 
+  background-color: #2e2e2e;
   color: white;
   font-weight: bold;
   text-shadow: 0px 1px 1px black;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/_form.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_form.scss b/ui/stylesheets/csui/_form.scss
index f3cd425..cc27a26 100644
--- a/ui/stylesheets/csui/_form.scss
+++ b/ui/stylesheets/csui/_form.scss
@@ -20,6 +20,9 @@
 
 @mixin csui-dropdown-dark {
   @include csui-dropdown;
+
+  background-color: #333333;
+
   @include background(
       url(csui/img/form/dropdown-arrow-white.png) no-repeat right 8px center,
       linear-gradient(#4e4e4e, #242424)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/_header.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_header.scss b/ui/stylesheets/csui/_header.scss
index cadfc41..de2be7e 100644
--- a/ui/stylesheets/csui/_header.scss
+++ b/ui/stylesheets/csui/_header.scss
@@ -1,4 +1,6 @@
 @mixin csui-header {
+  background-color: #0a5f91;
+
   @include background(
     url(csui/img/overlay-pattern.png) repeat,
     url(csui/img/header/gradient.png) no-repeat
@@ -7,7 +9,7 @@
   background-size: auto, cover;
 
   .logo {
-    background: url(csui/img/logo-main.png) no-repeat left;
+    background: url(csui/img/header/logo.png) no-repeat left;
     width: 1280px;
     height: 80px;
     margin: auto;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/_login.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_login.scss b/ui/stylesheets/csui/_login.scss
index 7324a6f..5a664c6 100644
--- a/ui/stylesheets/csui/_login.scss
+++ b/ui/stylesheets/csui/_login.scss
@@ -2,6 +2,8 @@
   height: 100%;
   min-height: 630px;
 
+  background-color: #385770;
+
   @include background(
     url(csui/img/login/brand-logo.png),
     url(csui/img/login/bottom-bar.png),
@@ -16,6 +18,7 @@
   form {
     @include row;
 
+    background-color: #000812;
     background: rgba(#000812, 0.8);
     padding-top: 60px;
     padding-bottom: 60px;
@@ -24,17 +27,15 @@
 
     .logo {
       @include shift(2);
-      @include span-columns(3);
+      @include span-columns(4);
 
-      background: url(csui/img/logo-main.png) no-repeat top center;
-      background-size: contain;
+      background: url(csui/img/login/logo.png) no-repeat top center;
       float: left;
       height: 300px;
     }
 
     .fields {
       @include span-columns(3);
-      @include shift(1);
 
       color: white;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/img/header/logo.png
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/img/header/logo.png b/ui/stylesheets/csui/img/header/logo.png
new file mode 100644
index 0000000..c9c5a37
Binary files /dev/null and b/ui/stylesheets/csui/img/header/logo.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/img/login/brand-logo.png
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/img/login/brand-logo.png b/ui/stylesheets/csui/img/login/brand-logo.png
index cca6540..6ad230e 100755
Binary files a/ui/stylesheets/csui/img/login/brand-logo.png and b/ui/stylesheets/csui/img/login/brand-logo.png
differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/img/login/logo.png
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/img/login/logo.png b/ui/stylesheets/csui/img/login/logo.png
new file mode 100644
index 0000000..33adf36
Binary files /dev/null and b/ui/stylesheets/csui/img/login/logo.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/deefb7e4/ui/stylesheets/csui/img/logo-main.png
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/img/logo-main.png b/ui/stylesheets/csui/img/logo-main.png
deleted file mode 100644
index 82a0f05..0000000
Binary files a/ui/stylesheets/csui/img/logo-main.png and /dev/null differ


Mime
View raw message