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/07 21:08:17 UTC
git commit: updated refs/heads/ui-restyle to 61167c5
Updated Branches:
refs/heads/ui-restyle 205f22b03 -> 61167c51b
Detail view: better layout for action buttons
-Make action icons in their own row
-Fix alignment of text action buttons
-Put view all links under action row
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61167c51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61167c51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61167c51
Branch: refs/heads/ui-restyle
Commit: 61167c51bb3d57d266b71fd65edab278f249b3e3
Parents: 205f22b
Author: Brian Federle <br...@citrix.com>
Authored: Mon Oct 7 12:07:34 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Oct 7 12:07:34 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/cloudstack.scss | 51 +++++++++++++++++++++++++++--------
ui/stylesheets/csui/_action.scss | 14 +++++-----
2 files changed, 48 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61167c51/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 8efe3ff..0821f86 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -248,25 +248,54 @@ body {
display: none;
}
- &:not(.detail-actions) {
- table {
- width: 100%;
+ table {
+ width: 100%;
- tr {
- &:nth-child(even) {
- background: lighten(#ccc, 12%);
- }
- }
-
- th, td {
- padding: 10px;
+ tr {
+ &:nth-child(even) {
+ background: lighten(#ccc, 12%);
}
}
+
+ th, td {
+ padding: 10px;
+ }
}
.detail-actions {
background: white;
border-radius: 6px;
+ display: inline-block;
+ height: 50px;
+ overflow: hidden;
+ @include row;
+
+ .buttons {
+ .action:not(.text) {
+ margin: 8px 5px;
+ }
+
+ .action.text {
+ margin-left: 25px;
+ margin-top: -4px;
+ }
+ }
+ }
+
+ td.view-all {
+ display: block;
+ float: left;
+ padding: 15px 25px 0 0;
+
+ a {
+ color: #5194C0;
+ text-decoration: none;
+
+ &:hover {
+ text-decoration: underline;
+ color: black;
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61167c51/ui/stylesheets/csui/_action.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_action.scss b/ui/stylesheets/csui/_action.scss
index c85dc92..c862240 100644
--- a/ui/stylesheets/csui/_action.scss
+++ b/ui/stylesheets/csui/_action.scss
@@ -15,12 +15,6 @@
// specific language governing permissions and limitations
// under the License.
@mixin csui-action-button {
- &:not(.button) {
- width: 25px;
- height: 25px;
- margin: 4px;
- }
-
float: left;
cursor: pointer;
@@ -30,6 +24,10 @@
}
a {
+ width: 25px;
+ height: 20px;
+ display: block;
+ float: left;
text-decoration: none;
}
@@ -48,5 +46,9 @@
@include csui-button;
float: right;
+
+ span {
+ float: right;
+ }
}
}
\ No newline at end of file