Repository: ignite Updated Branches: refs/heads/ignite-843 7db239961 -> f461908f1
ignite-1594 Home page fixes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f461908f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f461908f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f461908f Branch: refs/heads/ignite-843 Commit: f461908f1850b976722257c8e362b4aab766e87b Parents: 7db2399 Author: Andrey <[email protected]> Authored: Fri Oct 2 16:02:09 2015 +0700 Committer: Andrey <[email protected]> Committed: Fri Oct 2 16:02:09 2015 +0700 ---------------------------------------------------------------------- .../js/public/stylesheets/_bootstrap-variables.scss | 8 ++++---- .../src/main/js/public/stylesheets/style.scss | 14 ++++++-------- .../control-center-web/src/main/js/views/index.jade | 15 +++++++-------- 3 files changed, 17 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f461908f/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss index c9138bb..a1736f1 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss @@ -826,15 +826,15 @@ $breadcrumb-separator: "/" !default; $carousel-text-shadow: none !default; -$carousel-control-color: #555 !default; +$carousel-control-color: #333 !default; $carousel-control-width: 15% !default; $carousel-control-opacity: 1 !default; $carousel-control-font-size: 20px !default; -$carousel-indicator-active-bg: #555 !default; -$carousel-indicator-border-color: #555 !default; +$carousel-indicator-active-bg: #333 !default; +$carousel-indicator-border-color: #333 !default; -$carousel-caption-color: #555 !default; +$carousel-caption-color: #333 !default; //== Close http://git-wip-us.apache.org/repos/asf/ignite/blob/f461908f/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 b55eac2..35fb251 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 @@ -1743,7 +1743,6 @@ treecontrol.tree-classic { } .carousel-caption { - color: $ignite-header-color; position: relative; left: auto; right: auto; @@ -1756,14 +1755,15 @@ treecontrol.tree-classic { } .carousel-control { - font-size: 30px; + font-size: 20px; + z-index: 16; // Toggles .fa-chevron-left,.fa-chevron-right { position: absolute; - top: 50%; + top: 92.7%; margin-top: -10px; - z-index: 5; + z-index: 16; display: inline-block; margin-left: -10px; } @@ -1781,12 +1781,10 @@ treecontrol.tree-classic { .carousel-control.left { background-image: none; - margin-left: -50px; - padding-right: 50px; + margin-left: 150px; } .carousel-control.right { background-image: none; - margin-right: -50px; - padding-left: 50px; + margin-right: 150px; } http://git-wip-us.apache.org/repos/asf/ignite/blob/f461908f/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 a577424..0237cae 100644 --- a/modules/control-center-web/src/main/js/views/index.jade +++ b/modules/control-center-web/src/main/js/views/index.jade @@ -32,14 +32,6 @@ block body .container.body-container .main-content(ng-controller='auth') .row - 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 - li Automatically load SQL metadata form any RDBMS - li Connect to Ignite cluster and run SQL analytics on it - hr - - .row .col-xs-12.col-md-6 form(name='loginForm') .modal-body.row @@ -76,6 +68,13 @@ block body a.labelField(ng-click='action = "password/forgot"' on-click-focus='user_email') Forgot password? 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-10.col-sm-10.col-sm-offset-1(style='margin-top:20px') + 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 + li Automatically load SQL metadata form any RDBMS + li Connect to Ignite cluster and run SQL analytics on it .col-xs-12.col-md-6(style='padding-right: 20px;') #carousel.carousel.slide(data-ride='carousel') // Indicators
