You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/05 07:11:22 UTC
[1/2] ignite git commit: IGNITE-843 Title fix
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 95ae53b92 -> 880564708
IGNITE-843 Title fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f7623b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f7623b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f7623b
Branch: refs/heads/ignite-843-rc2
Commit: 30f7623b30cfeaacf3a846187850460dfac4e90e
Parents: a39a8d8
Author: Andrey <an...@gridgain.com>
Authored: Fri Feb 5 13:10:20 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Feb 5 13:10:20 2016 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 2 +-
.../control-center-web/src/main/js/views/includes/header.jade | 7 ++-----
modules/control-center-web/src/main/js/views/login.jade | 4 ++--
3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/30f7623b/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 f28516f..46aa510 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
@@ -233,7 +233,7 @@ ul.navbar-nav, .sidebar-nav {
}
.header .title {
- margin: 5px 0;
+ margin: 20px 0 5px 0;
padding: 0 15px;
font-size: 1.4em;
http://git-wip-us.apache.org/repos/asf/ignite/blob/30f7623b/modules/control-center-web/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade
index e1ed222..5ff7766 100644
--- a/modules/control-center-web/src/main/js/views/includes/header.jade
+++ b/modules/control-center-web/src/main/js/views/includes/header.jade
@@ -19,12 +19,9 @@ header#header.header
| Currently assuming #[strong {{$root.user.username}}], #[a(ng-click='$root.revertIdentity()') revert to your identity].
table.container
tr
- td.col-xs-3.col-sm-3.col-md-2(rowspan='2')
+ td.col-xs-3.col-sm-3.col-md-2
ignite-logo
- td
- ignite-title
- tr
- td.navbar-collapse.collapse(ng-if='$root.user')
+ td(ng-if='$root.user' style='padding-top: 20px')
ul.nav.navbar-nav(ignite-configuration-sidebar ignite-navbar)
li(ng-class='{active: $state.includes("base.configuration")}')
a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
http://git-wip-us.apache.org/repos/asf/ignite/blob/30f7623b/modules/control-center-web/src/main/js/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade
index 9c3fe38..96e24ad 100644
--- a/modules/control-center-web/src/main/js/views/login.jade
+++ b/modules/control-center-web/src/main/js/views/login.jade
@@ -23,9 +23,9 @@ mixin lblRequired(txt)
header#header.header
table.container
tr
- td.col-xs-3.col-sm-3.col-md-2(rowspan='2')
+ td.col-xs-3.col-sm-3.col-md-2
ignite-logo
- td(style='padding-top: 20px')
+ td
ignite-title
.container.body-container
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88056470
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88056470
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88056470
Branch: refs/heads/ignite-843-rc2
Commit: 880564708be15f8b1ba4fd0eddfef693883322cf
Parents: 30f7623 95ae53b
Author: Andrey <an...@gridgain.com>
Authored: Fri Feb 5 13:11:28 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Feb 5 13:11:28 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 3 ++-
.../src/main/js/controllers/clusters-controller.js | 2 +-
.../src/main/js/controllers/domains-controller.js | 4 ++--
.../src/main/js/controllers/igfs-controller.js | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------