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 20:29:43 UTC
git commit: updated refs/heads/ui-restyle to a0fcbbb
Updated Branches:
refs/heads/ui-restyle ad5d3bc0d -> a0fcbbbfa
Header action button appearance
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0fcbbbf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0fcbbbf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0fcbbbf
Branch: refs/heads/ui-restyle
Commit: a0fcbbbfa8ed922cefbb98d4596a5b1f8d81dabe
Parents: ad5d3bc
Author: Brian Federle <br...@citrix.com>
Authored: Mon Oct 7 11:29:31 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Oct 7 11:29:31 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 3 ++-
ui/stylesheets/csui/_action.scss | 23 ++++++++++++++++++-----
2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0fcbbbf/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index ab0e7a0..f89cd0d 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -38,7 +38,7 @@
jsonObj: $.map($instanceRow, function(elem) { return $(elem).data('jsonObj'); })
};
messageArgs = {
- name: $.map($instanceRow, function(elem) { return $(elem).find('td.name span').html() })
+ name: $.map($instanceRow, function(elem) { return $(elem).find('td.name span').html(); })
};
} else {
data = {
@@ -1652,6 +1652,7 @@
.addClass('button action add reduced-hide')
.data('list-view-action-id', 'add')
.append(
+ $('<span>').addClass('icon').html(' '),
$('<span>').html(_l(listViewData.actions.add.label))
)
);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0fcbbbf/ui/stylesheets/csui/_action.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_action.scss b/ui/stylesheets/csui/_action.scss
index 810123a..c85dc92 100644
--- a/ui/stylesheets/csui/_action.scss
+++ b/ui/stylesheets/csui/_action.scss
@@ -15,20 +15,33 @@
// specific language governing permissions and limitations
// under the License.
@mixin csui-action-button {
- width: 25px;
- height: 25px;
+ &:not(.button) {
+ width: 25px;
+ height: 25px;
+ margin: 4px;
+ }
+
float: left;
- margin: 4px;
cursor: pointer;
+ span {
+ display: block;
+ float: left;
+ }
+
a {
text-decoration: none;
}
.icon {
display: block;
- width: 100%;
- height: 100%;
+ width: 25px;
+ height: 20px;
+ margin-bottom: -12px; // Keep aligned with non-icon buttons
+ float: left;
+ position: relative;
+ top: -5px;
+ left: -5px;
}
&.text {