flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [07/11] flink git commit: [FLINK-3262] [web-dashboard] Remove fuzzy versioning from Bower dependencies
Date Thu, 28 Jan 2016 13:56:58 GMT
http://git-wip-us.apache.org/repos/asf/flink/blob/1ea5e138/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.ttf
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.ttf b/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index ed9372f..0000000
Binary files a/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.ttf and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/flink/blob/1ea5e138/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff b/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 8b280b9..0000000
Binary files a/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/flink/blob/1ea5e138/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff2
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff2 b/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff2
deleted file mode 100644
index 3311d58..0000000
Binary files a/flink-runtime-web/web-dashboard/assets/fonts/fontawesome-webfont.woff2 and
/dev/null differ

http://git-wip-us.apache.org/repos/asf/flink/blob/1ea5e138/flink-runtime-web/web-dashboard/bower.json
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/bower.json b/flink-runtime-web/web-dashboard/bower.json
index 2d8f174..9edbff4 100644
--- a/flink-runtime-web/web-dashboard/bower.json
+++ b/flink-runtime-web/web-dashboard/bower.json
@@ -12,16 +12,16 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.1.4",
-    "angular": "~1.3.15",
-    "angular-moment": "~0.9.2",
-    "angular-ui-router": "~0.2.13",
-    "bootstrap": "~3.3.5",
-    "d3": "~3.5.5",
-    "dagre-d3": "~0.4.10",
-    "font-awesome": "~4.3.0",
-    "moment-duration-format": "~1.3.0",
-    "qtip2": "~2.2.1"
+    "jquery": "2.2.0",
+    "angular": "1.4.8",
+    "angular-moment": "0.10.3",
+    "angular-ui-router": "0.2.15",
+    "bootstrap": "3.3.6",
+    "d3": "3.5.12",
+    "dagre-d3": "0.4.11",
+    "font-awesome": "4.5.0",
+    "moment-duration-format": "1.3.0",
+    "qtip2": "2.2.1"
   },
   "overrides": {
     "dagre-d3": {

http://git-wip-us.apache.org/repos/asf/flink/blob/1ea5e138/flink-runtime-web/web-dashboard/gulpfile.js
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/gulpfile.js b/flink-runtime-web/web-dashboard/gulpfile.js
index 737519e..28c7a33 100644
--- a/flink-runtime-web/web-dashboard/gulpfile.js
+++ b/flink-runtime-web/web-dashboard/gulpfile.js
@@ -17,7 +17,7 @@
  */
 
 // ----------------------------------------------------------------------------
-//  Builde file for the web dashboard
+//  Build file for the web dashboard
 // ----------------------------------------------------------------------------
 
 var gulp = require('gulp');
@@ -66,17 +66,16 @@ gulp.task('assets', function() {
     .pipe(gulp.dest(paths.dest));
 });
 
-
-gulp.task('bootstrap', function () {
-  return gulp.src(paths.src + 'styles/bootstrap_custom.less')
+gulp.task('pre-process-vendor-styles', function () {
+  return gulp.src(mainBowerFiles('**/*.less').concat(paths.src + 'styles/bootstrap_custom.less'))
     .pipe(less({
       paths: [ path.join(__dirname, 'less', 'includes') ]
     }))
     .pipe(gulp.dest(paths.tmp + 'css/'));
 });
 
-gulp.task('vendor-styles', [ 'bootstrap' ], function() {
-  stream = gulp.src(mainBowerFiles().concat([paths.tmp + 'css/bootstrap_custom.css']).concat([paths.vendor
+ 'qtip2/jquery.qtip.css']))
+gulp.task('vendor-styles', [ 'pre-process-vendor-styles' ], function() {
+  stream = gulp.src(mainBowerFiles().concat([paths.tmp + 'css/*.css']).concat([paths.vendor
+ 'qtip2/jquery.qtip.css']))
     .pipe(filter(['*.css', '!bootstrap.css']))
     .pipe(sourcemaps.init())
     .pipe(concat("vendor.css"))
@@ -87,7 +86,7 @@ gulp.task('vendor-styles', [ 'bootstrap' ], function() {
   }
 
   stream.pipe(gulp.dest(paths.dest + 'css/'))
- });
+});
 
 gulp.task('vendor-scripts', function() {
   stream = gulp.src(mainBowerFiles({


Mime
View raw message