You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/15 10:25:31 UTC
[02/14] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5075-cacheStart
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075-cacheStart
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca0cc87c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca0cc87c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca0cc87c
Branch: refs/heads/ignite-5075
Commit: ca0cc87caf6c6e47fc9669e725ec74feb9818b79
Parents: 3762b0d 63fda7f
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 12 12:25:15 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri May 12 12:25:15 2017 +0300
----------------------------------------------------------------------
modules/web-console/frontend/app/app.js | 7 +-
.../cluster-select/cluster-select.pug | 6 +-
.../cluster-select/cluster-select.scss | 30 ++++
.../app/components/cluster-select/index.js | 1 +
.../components/web-console-footer/component.js | 23 ++++
.../app/components/web-console-footer/index.js | 23 ++++
.../components/web-console-footer/style.scss | 41 ++++++
.../components/web-console-footer/template.pug | 19 +++
.../components/web-console-header/component.js | 34 +++++
.../app/components/web-console-header/index.js | 23 ++++
.../components/web-console-header/style.scss | 136 +++++++++++++++++++
.../components/web-console-header/template.pug | 25 ++++
.../app/modules/branding/branding.provider.js | 2 +-
.../modules/branding/header-title.directive.js | 6 +-
.../branding/powered-by-apache.directive.js | 3 +-
.../frontend/app/modules/states/signin.state.js | 2 +
.../frontend/gulpfile.babel.js/paths.js | 1 +
.../frontend/public/images/ignite-logo.png | Bin 1982 -> 0 bytes
.../frontend/public/images/ignite-logo.svg | 17 +++
.../frontend/public/images/ignite-logo@2x.png | Bin 3325 -> 0 bytes
.../stylesheets/_bootstrap-variables.scss | 4 +-
.../frontend/public/stylesheets/style.scss | 76 ++---------
.../frontend/public/stylesheets/variables.scss | 2 +
modules/web-console/frontend/views/403.tpl.pug | 8 +-
modules/web-console/frontend/views/404.tpl.pug | 8 +-
modules/web-console/frontend/views/base.pug | 8 +-
modules/web-console/frontend/views/base2.pug | 8 +-
.../frontend/views/includes/header-left.pug | 64 +++++++++
.../frontend/views/includes/header-right.pug | 40 ++++++
.../frontend/views/includes/header.pug | 57 --------
modules/web-console/frontend/views/index.pug | 2 +-
.../web-console/frontend/views/reset.tpl.pug | 12 +-
.../web-console/frontend/views/signin.tpl.pug | 12 +-
33 files changed, 541 insertions(+), 159 deletions(-)
----------------------------------------------------------------------