Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 27424189AE for ; Mon, 5 Oct 2015 03:47:48 +0000 (UTC) Received: (qmail 31498 invoked by uid 500); 5 Oct 2015 03:47:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31462 invoked by uid 500); 5 Oct 2015 03:47:48 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 31452 invoked by uid 99); 5 Oct 2015 03:47:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Oct 2015 03:47:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B8A1EDFA85; Mon, 5 Oct 2015 03:47:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: <7155b5a25be440d1bb684cd945b13a83@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1594 Changed home. Date: Mon, 5 Oct 2015 03:47:47 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843 8c6e77c97 -> a5f97afcf 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/a5f97afc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a5f97afc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a5f97afc Branch: refs/heads/ignite-843 Commit: a5f97afcf712a361e3706c0ece02bf83ecb99bef Parents: 8c6e77c Author: Andrey Authored: Mon Oct 5 10:47:39 2015 +0700 Committer: Andrey Committed: Mon Oct 5 10:47:39 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/public/stylesheets/style.scss | 20 ++++++++++++++++++-- .../src/main/js/views/index.jade | 8 ++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a5f97afc/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 d607722..08cb667 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 @@ -1769,11 +1769,27 @@ treecontrol.tree-classic { } .fa-chevron-left { + @media(min-width: 1200px) { + left: 50%; + } + + @media(min-width: 992px) { + left: -75%; + } + left: 50%; margin-left: -10px; } .fa-chevron-right { + @media(min-width: 1200px) { + right: 50%; + } + + @media(min-width: 992px) { + right: -75%; + } + right: 50%; margin-right: -10px; } @@ -1799,10 +1815,10 @@ treecontrol.tree-classic { } .home { - min-height: 800px; + min-height: 840px; padding: 20px; - @media(min-width: 940px) { + @media(min-width: 992px) { min-height: 450px; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a5f97afc/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 d8751c5..bae50d3 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-sm-3.col-sm-offset-1.required #{txt} + label.col-xs-4.col-md-3.col-md-offset-1.required #{txt} block body header#header.header @@ -35,6 +35,10 @@ block body .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"') | 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. @@ -69,7 +73,7 @@ block body a.labelLogin(ng-click='action = "register"' on-click-focus='user_name') Sign Up button#login.btn.btn-primary(ng-click='auth(action, user_info)' ng-disabled='loginForm.$invalid') Log In - .col-xs-12.col-md-11.home-panel(style='margin-top:20px') + .col-xs-12.col-md-11.home-panel p Apache Ignite Web Console is an interactive web management tool which allows users to: ul li Create and download various configurations for Apache Ignite