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/09/23 20:39:43 UTC
[1/2] git commit: updated refs/heads/ui-restyle to ba0140d
Updated Branches:
refs/heads/ui-restyle c0c1cb9a9 -> ba0140da6
Header: hide old project view switcher
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/360bf2c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/360bf2c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/360bf2c4
Branch: refs/heads/ui-restyle
Commit: 360bf2c4f21f9b51ad1b21070c5b6f6d83e3ac66
Parents: c0c1cb9
Author: Brian Federle <br...@citrix.com>
Authored: Mon Sep 23 11:39:05 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Sep 23 11:39:05 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/cloudstack.scss | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/360bf2c4/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 42e674b..30aaf08 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -46,6 +46,10 @@ body {
}
}
+ .view-switcher {
+ display: none !important;
+ }
+
#user {
background: url(csui/img/form/dropdown-arrow-white.png) no-repeat right;
}
[2/2] git commit: updated refs/heads/ui-restyle to ba0140d
Posted by bf...@apache.org.
Fix login form elements:
-Don't hide labels on focus
-Fix lower brand logo size
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba0140da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba0140da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba0140da
Branch: refs/heads/ui-restyle
Commit: ba0140da601942648c03fa789580ae7017b5ea1b
Parents: 360bf2c
Author: Brian Federle <br...@citrix.com>
Authored: Mon Sep 23 11:39:15 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Sep 23 11:39:15 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/login.js | 27 ---------------------------
ui/stylesheets/csui/_login.scss | 6 +++---
2 files changed, 3 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba0140da/ui/scripts/ui-custom/login.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js
index de192ee..5d8d0ee 100644
--- a/ui/scripts/ui-custom/login.js
+++ b/ui/scripts/ui-custom/login.js
@@ -53,33 +53,6 @@
// Form validation
$form.validate();
- // Form label behavior
- $inputs.bind('keydown focus click blur', function(event) {
- var $target = $(event.target);
- var $label = $form.find('label').filter(function() {
- return $(this).attr('for') == $target.attr('name');
- });
-
- if (event.type == 'keydown') {
- $label.hide();
-
- return true;
- } else if (event.type == 'blur') {
- if ($target.hasClass('first-input')) {
- $target.removeClass('first-input');
- }
- if (!$(this).val()) {
- $label.show();
- }
- } else {
- if (!$target.hasClass('first-input')) {
- $label.hide();
- }
- }
-
- return true;
- });
-
if (!args.hasLogo) $login.addClass('nologo');
// Labels cause related input to be focused
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba0140da/ui/stylesheets/csui/_login.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_login.scss b/ui/stylesheets/csui/_login.scss
index bf24345..8f23b90 100644
--- a/ui/stylesheets/csui/_login.scss
+++ b/ui/stylesheets/csui/_login.scss
@@ -10,8 +10,8 @@
);
background-repeat: no-repeat, repeat-x, repeat, no-repeat;
- background-size: auto, auto, auto, cover;
- background-position: center bottom 25px, bottom, center, center;
+ background-size: 300px, auto, auto, cover;
+ background-position: center bottom 10px, bottom, center, center;
form {
@include row;
@@ -30,7 +30,7 @@
background: url(csui/img/logo-main.png) no-repeat top center;
background-size: contain;
float: left;
- height: 500px;
+ height: 300px;
}
.fields {