From 16f1e3a68a93d38e0cbda24f021bcd847fabb3ba Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Tue, 1 Oct 2013 12:17:57 -0700
Subject: [PATCH] Style toolbar

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

diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index a47c490a935..22b4fdd6e01 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);
 
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index c87a57e1542..736a206ae7a 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;
-    }
 }
diff --git a/ui/stylesheets/csui/_toolbar.scss b/ui/stylesheets/csui/_toolbar.scss
index dba7c32f3b2..ff0557e49df 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;
-
-    .search-bar {
-        @include span-columns(2);
-
-        input[type=text] {
-            padding: 5px;
-        }
-    }
+    background: lighten(#e0e0e0, 5%);
+    padding: 10px;
 
     .button.action {
         @include csui-button;
 
         float: right;
-        margin: 8px;
+        margin-right: 10px;
+    }
+
+    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-right: 25px;
     }
 }
\ No newline at end of file