ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: ignite-1594 Changed home.
Date Mon, 05 Oct 2015 08:48:16 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 643e7befa -> eeca4ce79


ignite-1594 Changed home.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeca4ce7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeca4ce7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeca4ce7

Branch: refs/heads/ignite-843
Commit: eeca4ce79680c08128c746c76f493e0807c4cdb3
Parents: 643e7be
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Oct 5 15:48:07 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Oct 5 15:48:07 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss   | 15 ++++++--
 .../src/main/js/views/index.jade                | 36 +++++++++++---------
 2 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/eeca4ce7/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 08cb667..10517f1 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -326,11 +326,20 @@ h1, h2, h3, h4, h5, h6 {
     }
 }
 
+.login-header {
+    margin-top: 0;
+    margin-bottom: 20px
+}
+
 .login-footer {
     @extend .modal-footer;
 
-    padding-left: 8px;
-    padding-right: 4px;
+    padding-left: 0;
+    padding-right: 0;
+
+    .btn {
+        margin-right: 0;
+    }
 }
 
 .modal-body {
@@ -1815,7 +1824,7 @@ treecontrol.tree-classic {
 }
 
 .home {
-    min-height: 840px;
+    min-height: 880px;
     padding: 20px;
 
     @media(min-width: 992px) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/eeca4ce7/modules/control-center-web/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/index.jade b/modules/control-center-web/src/main/js/views/index.jade
index bae50d3..4d59a63 100644
--- a/modules/control-center-web/src/main/js/views/index.jade
+++ b/modules/control-center-web/src/main/js/views/index.jade
@@ -20,7 +20,7 @@ append scripts
     script(src='//cdn.rawgit.com/twbs/bootstrap/master/js/carousel.js')
 
 mixin lbl(txt)
-    label.col-xs-4.col-md-3.col-md-offset-1.required #{txt}
+    label.col-xs-3.col-md-2.required #{txt}
 
 block body
     header#header.header
@@ -34,31 +34,33 @@ block body
             .row.greedy.home
                 .col-xs-12.col-md-6
                     form(name='loginForm')
-                        .modal-body.row(style='padding-top: 0')
-                            .details-row(ng-if='action == "register"')
-                                h3.col-xs-offset-4.col-md-offset-4(style='margin-top: 0;
margin-bottom: 15px') Sign up
-                            .details-row(ng-if='action == "login"')
-                                h3.col-xs-offset-4.col-md-offset-4(style='margin-top: 0;
margin-bottom: 15px') Log in
-                            .details-row
-                                p.col-xs-12.col-md-12(ng-show='action == "password/forgot"')
+                        .modal-body.row(style='padding: 0; margin: 0')
+                            .settings-row(ng-if='action == "register"')
+                                h3.login-header Sign Up
+                            .settings-row(ng-if='action == "login"')
+                                h3.login-header Log In
+                            .settings-row(ng-if='action == "password/forgot"')
+                                h3.login-header Forgot password?
+                            .settings-row
+                                p.col-xs-12.col-md-11(ng-show='action == "password/forgot"')
                                     | That's ok! Simply enter your email below and a reset
password link will be sent to you via email. You can then follow that link and select a new
password.
-                            .details-row(ng-show='action == "register"')
+                            .settings-row(ng-show='action == "register"')
                                 +lbl('Full Name:')
-                                .col-xs-6.col-md-8
+                                .col-xs-9.col-md-8
                                     input#user_name.form-control(enter-focus-next='user_email'
type='text' ng-model='user_info.username' placeholder='John Smith' ng-required='action=="register"')
-                            .details-row
+                            .settings-row
                                 +lbl('Email:')
-                                .col-xs-6.col-md-8
+                                .col-xs-9.col-md-8
                                     input#user_email.form-control(enter-focus-next='user_password'
type='email' ng-model='user_info.email' placeholder='you@domain.com' required on-enter='action
== "password/forgot" && loginForm.$valid && auth(action, user_info)')
-                            .details-row(ng-show='action != "password/forgot"')
+                            .settings-row(ng-show='action != "password/forgot"')
                                 +lbl('Password:')
-                                .col-xs-6.col-md-8
+                                .col-xs-9.col-md-8
                                     input#user_password.form-control(enter-focus-next='user_confirm'
type='password' ng-model='user_info.password' placeholder='Password' ng-required='action !=
"password/forgot"' on-enter='action == "login" && loginForm.$valid && auth(action,
user_info)')
-                            .details-row(ng-if='action == "register"')
+                            .settings-row(ng-if='action == "register"')
                                 +lbl('Confirm:')
-                                .col-xs-6.col-md-8
+                                .col-xs-9.col-md-8
                                     input#user_confirm.form-control(type='password' ng-model='user_info.confirm'
match='user_info.password' placeholder='Confirm password' ng-required='action == "register"'
on-enter='loginForm.$valid && auth(action, user_info)')
-                        .col-xs-10.col-md-11
+                        .col-xs-12.col-md-11
                             .login-footer(ng-show='action == "register"')
                                 a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email')
Forgot password?
                                 a.labelLogin(ng-click='action = "login"' on-click-focus='user_email')
Log In


Mime
View raw message