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 16f1e3a
Date Tue, 01 Oct 2013 19:18:03 GMT
Updated Branches:
  refs/heads/ui-restyle 5c827f762 -> 16f1e3a68


Style toolbar


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

Branch: refs/heads/ui-restyle
Commit: 16f1e3a68a93d38e0cbda24f021bcd847fabb3ba
Parents: 5c827f7
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Oct 1 12:17:57 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Oct 1 12:17:57 2013 -0700

----------------------------------------------------------------------
 ui/scripts/ui/widgets/listView.js |  2 +-
 ui/stylesheets/cloudstack.scss    |  6 ------
 ui/stylesheets/csui/_toolbar.scss | 29 +++++++++++++++++++----------
 3 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16f1e3a6/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index a47c490..22b4fdd 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -839,7 +839,7 @@
         if (!filters) return false;
 
         var $filters = $('<div></div>').addClass('filters reduced-hide');
-        $filters.append($('<label>').html(_l('label.filterBy')));
+        $filters.append($('<label>').html(_l('label.filterBy') + ': '));
 
         var $filterSelect = $('<select id="filterBy"></select>').appendTo($filters);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16f1e3a6/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index c87a57e..736a206 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -249,10 +249,4 @@ body {
     .panel-controls {
         display: none;
     }
-
-    .section-select, .filters {
-        @include span-columns(4);
-
-        margin: 8px;
-    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16f1e3a6/ui/stylesheets/csui/_toolbar.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_toolbar.scss b/ui/stylesheets/csui/_toolbar.scss
index dba7c32..ff0557e 100644
--- a/ui/stylesheets/csui/_toolbar.scss
+++ b/ui/stylesheets/csui/_toolbar.scss
@@ -1,21 +1,30 @@
 @mixin csui-toolbar {
     @include row;
 
-    padding: 5px;
-    background: #e0e0e0;
+    background: lighten(#e0e0e0, 5%);
+    padding: 10px;
 
-    .search-bar {
-        @include span-columns(2);
+    .button.action {
+        @include csui-button;
 
-        input[type=text] {
-            padding: 5px;
-        }
+        float: right;
+        margin-right: 10px;
     }
 
-    .button.action {
-        @include csui-button;
+    input, label, select {
+        float: left;
+        margin: 0 10px 0 10px;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        font-size: 12px;
+    }
 
+    label {
+        margin-right: 0px;
+    }
+
+    .search-bar {
         float: right;
-        margin: 8px;
+        margin-right: 25px;
     }
 }
\ No newline at end of file


Mime
View raw message