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 <[email protected]> Authored: Mon Sep 23 11:39:15 2013 -0700 Committer: Brian Federle <[email protected]> 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 {
