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/10 23:11:01 UTC
[1/3] git commit: updated refs/heads/ui-restyle to 09e4327
Updated Branches:
refs/heads/ui-restyle f302c8685 -> 09e432765
Dialog: remove top default close button; add button area margin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a46ba98c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a46ba98c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a46ba98c
Branch: refs/heads/ui-restyle
Commit: a46ba98c42e0071e6ee7c349d8ac4f2d65f9eaa8
Parents: f302c86
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 10 14:09:51 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 10 14:09:51 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/csui/_dialog.scss | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a46ba98c/ui/stylesheets/csui/_dialog.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_dialog.scss b/ui/stylesheets/csui/_dialog.scss
index f3b708f..832fa43 100644
--- a/ui/stylesheets/csui/_dialog.scss
+++ b/ui/stylesheets/csui/_dialog.scss
@@ -67,4 +67,12 @@
position: absolute;
top: 0px;
background: rgba(#000, 0.5);
+}
+
+.ui-icon.ui-icon-closethick {
+ display: none;
+}
+
+.ui-dialog-buttonpane {
+ margin-top: 20px;
}
\ No newline at end of file
[2/3] git commit: updated refs/heads/ui-restyle to 09e4327
Posted by bf...@apache.org.
Add styling for toolbar refresh button
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c8e1f72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c8e1f72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c8e1f72
Branch: refs/heads/ui-restyle
Commit: 9c8e1f720600959ba2880f8e44917720e74f2c4c
Parents: a46ba98
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 10 14:10:08 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 10 14:10:24 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/cloudstack.scss | 58 +++++++++++++++++++++--------------
ui/stylesheets/csui/_button.scss | 22 +++++++++++++
2 files changed, 57 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c8e1f72/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 8a606bf..2fad4ad 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -221,6 +221,35 @@ body {
}
}
+// Panel toolbars
+.toolbar {
+ @include csui-toolbar;
+
+ .panel-controls {
+ display: none;
+ }
+
+ .button.refresh {
+ @include csui-button-refresh;
+
+ float: right;
+ }
+}
+
+// Action buttons
+.action {
+ @include csui-action-button;
+
+ .icon {
+ background-image: url(../images/sprites.png);
+ }
+}
+
+// Wizards
+.multi-wizard {
+ @include csui-wizard;
+}
+
// List view widget
.list-view {
@include csui-list;
@@ -289,6 +318,12 @@ body {
}
.detail-view {
+ .toolbar {
+ background: none;
+ float: right;
+ padding: 0;
+ }
+
.ui-tabs-nav {
@include csui-tabs;
@@ -360,26 +395,3 @@ body {
}
}
}
-
-// Panel toolbars
-.toolbar {
- @include csui-toolbar;
-
- .panel-controls {
- display: none;
- }
-}
-
-// Action buttons
-.action {
- @include csui-action-button;
-
- .icon {
- background-image: url(../images/sprites.png);
- }
-}
-
-// Wizards
-.multi-wizard {
- @include csui-wizard;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c8e1f72/ui/stylesheets/csui/_button.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_button.scss b/ui/stylesheets/csui/_button.scss
index 48b3982..754ec3a 100644
--- a/ui/stylesheets/csui/_button.scss
+++ b/ui/stylesheets/csui/_button.scss
@@ -34,6 +34,18 @@
}
}
+@mixin csui-button-simple {
+ @include csui-button;
+
+ background: none;
+ border-color: white;
+
+ &:hover {
+ box-shadow: none;
+ border-color: #ccc;
+ }
+}
+
@mixin csui-button-cta {
@include csui-button;
@include linear-gradient(darkgray, lighten(black, 15%));
@@ -44,6 +56,16 @@
text-shadow: 0px 1px 1px black;
}
+@mixin csui-button-refresh {
+ @include csui-button-simple;
+
+ &:before {
+ @include icon($refresh);
+
+ margin-right: 10px;
+ }
+}
+
// Defaults
.ui-dialog button {
&:not(.ok) {
[3/3] git commit: updated refs/heads/ui-restyle to 09e4327
Posted by bf...@apache.org.
Detail view: Move toolbar to top of element for easier styling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09e43276
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09e43276
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09e43276
Branch: refs/heads/ui-restyle
Commit: 09e432765277135766255dbd6e803fb390e75106
Parents: 9c8e1f7
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 10 14:10:43 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 10 14:10:43 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09e43276/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 0e975e4..b7235a4 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1360,7 +1360,7 @@
// Create toolbar
if (!compact) {
- $toolbar.appendTo($detailView);
+ $toolbar.prependTo($detailView);
}
}