You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/01 00:28:04 UTC
git commit: updated refs/heads/ui-restyle to 01dffc5
Updated Branches:
refs/heads/ui-restyle ef7412798 -> 01dffc5d2
Add toolbar mixin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01dffc5d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01dffc5d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01dffc5d
Branch: refs/heads/ui-restyle
Commit: 01dffc5d28e0683f054274b6a3574f8130422f72
Parents: ef74127
Author: Brian Federle <br...@citrix.com>
Authored: Mon Sep 30 15:27:57 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Sep 30 15:27:57 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/cloudstack.scss | 24 ++++++++++++++++++++++--
ui/stylesheets/csui/_button.scss | 1 +
ui/stylesheets/csui/_csui.scss | 3 ++-
ui/stylesheets/csui/_list.scss | 4 +---
ui/stylesheets/csui/_toolbar.scss | 21 +++++++++++++++++++++
5 files changed, 47 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01dffc5d/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 1c7b266..ef197b7 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -240,7 +240,27 @@ body {
// List view widget
.list-view {
- @include list;
+ @include csui-list;
+}
+
+.toolbar {
+ @include csui-toolbar;
+
+ .panel-controls {
+ display: none;
+ }
+
+ .section-select, .filters {
+ @include span-columns(3);
+
+ margin: 8px;
- margin: 20px;
+ label {
+ top: 0px;
+ margin-right: 8px;
+ }
+
+ select {
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01dffc5d/ui/stylesheets/csui/_button.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_button.scss b/ui/stylesheets/csui/_button.scss
index 626d4ae..087ca50 100644
--- a/ui/stylesheets/csui/_button.scss
+++ b/ui/stylesheets/csui/_button.scss
@@ -26,6 +26,7 @@
font-size: 12px;
border-radius: 3px;
border: 1px solid black;
+ cursor: pointer;
&:hover {
box-shadow: inset 0 0 10px black;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01dffc5d/ui/stylesheets/csui/_csui.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_csui.scss b/ui/stylesheets/csui/_csui.scss
index 59f7760..bd6c10c 100644
--- a/ui/stylesheets/csui/_csui.scss
+++ b/ui/stylesheets/csui/_csui.scss
@@ -55,4 +55,5 @@ html, body {
@import "header";
@import "asset";
@import "dialog";
-@import "list";
\ No newline at end of file
+@import "list";
+@import "toolbar";
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01dffc5d/ui/stylesheets/csui/_list.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_list.scss b/ui/stylesheets/csui/_list.scss
index a47c97f..3a16297 100644
--- a/ui/stylesheets/csui/_list.scss
+++ b/ui/stylesheets/csui/_list.scss
@@ -14,9 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-@mixin list {
- padding: 20px;
-
+@mixin csui-list {
table {
width: 100%;
margin-top: 20px;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01dffc5d/ui/stylesheets/csui/_toolbar.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_toolbar.scss b/ui/stylesheets/csui/_toolbar.scss
new file mode 100644
index 0000000..dba7c32
--- /dev/null
+++ b/ui/stylesheets/csui/_toolbar.scss
@@ -0,0 +1,21 @@
+@mixin csui-toolbar {
+ @include row;
+
+ padding: 5px;
+ background: #e0e0e0;
+
+ .search-bar {
+ @include span-columns(2);
+
+ input[type=text] {
+ padding: 5px;
+ }
+ }
+
+ .button.action {
+ @include csui-button;
+
+ float: right;
+ margin: 8px;
+ }
+}
\ No newline at end of file