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 2015/11/18 04:10:42 UTC
[3/3] ignite git commit: IGNITE-1878 Review.
IGNITE-1878 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35ac8d42
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35ac8d42
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35ac8d42
Branch: refs/heads/ignite-843-rc1
Commit: 35ac8d4241f7b56857cf29e0f82cf129ed34377a
Parents: d9fb543
Author: Andrey <an...@gridgain.com>
Authored: Wed Nov 18 10:10:30 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Nov 18 10:10:30 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/app/index.js | 2 +-
.../control-center-web/src/main/js/gulpfile.js/tasks/bundle.js | 6 ++----
.../control-center-web/src/main/js/views/templates/layout.jade | 6 +-----
3 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35ac8d42/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index e9df2dc..74e63c7 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -31,4 +31,4 @@ import 'Blob'
window._ = _;
window.ace = ace;
window.require = ace.require;
-window.angular = angular;
\ No newline at end of file
+window.angular = angular;
http://git-wip-us.apache.org/repos/asf/ignite/blob/35ac8d42/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
index 7d1d510..fd733b0 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
@@ -2,8 +2,6 @@ var gulp = require('gulp');
var jspm = require('jspm');
gulp.task('bundle', function() {
- return jspm.bundleSFX('app/index', 'build/app.min.js', {
-
- })
-})
+ return jspm.bundleSFX('app/index', 'build/app.min.js', {})
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/35ac8d42/modules/control-center-web/src/main/js/views/templates/layout.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/layout.jade b/modules/control-center-web/src/main/js/views/templates/layout.jade
index 7252b23..e9f50c3 100644
--- a/modules/control-center-web/src/main/js/views/templates/layout.jade
+++ b/modules/control-center-web/src/main/js/views/templates/layout.jade
@@ -25,11 +25,7 @@ html(ng-app='ignite-web-console')
//- Font
link(rel='stylesheet', href='//fonts.googleapis.com/css?family=Roboto+Slab:700:serif|Roboto+Slab:400:serif')
- //- link(rel='stylesheet', href='//cdnjs.cloudflare.com/ajax/libs/angular-motion/0.4.2/angular-motion.min.css')
- //- link(rel='stylesheet', href='//cdn.rawgit.com/wix/angular-tree-control/master/css/tree-control.css')
- //- link(rel='stylesheet', href='//cdn.rawgit.com/wix/angular-tree-control/master/css/tree-control-attribute.css')
- //- link(rel='stylesheet' href='//rawgithub.com/darthwade/angular-loading/master/angular-loading.css')
- //- link(rel='stylesheet' href='//cdn.rawgit.com/ceolter/ag-grid/master/dist/ag-grid.css')
+
link(rel='stylesheet', href='/stylesheets/style.css')
block scripts