diff --git a/.gitattributes b/.gitattributes index cd8bbde4..9d598c00 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -glances/outputs/static/public/js/*.js -diff +glances/outputs/static/public/* -diff linguist-vendored diff --git a/glances/outputs/static/css/bootstrap.min.css b/glances/outputs/static/css/bootstrap.css similarity index 100% rename from glances/outputs/static/css/bootstrap.min.css rename to glances/outputs/static/css/bootstrap.css diff --git a/glances/outputs/static/gulpfile.js b/glances/outputs/static/gulpfile.js index 8fd530cb..615a9c8c 100644 --- a/glances/outputs/static/gulpfile.js +++ b/glances/outputs/static/gulpfile.js @@ -4,6 +4,7 @@ var mainBowerFiles = require('main-bower-files'); var ngAnnotate = require('gulp-ng-annotate'); var templateCache = require('gulp-angular-templatecache'); var del = require('del'); +var rename = require('gulp-rename'); gulp.task('clean', function() { del('./public/*') @@ -14,6 +15,7 @@ gulp.task('copy', function() { .pipe(gulp.dest('./public')); gulp.src('./css/*.css') + .pipe(rename({suffix: '.min'})) .pipe(gulp.dest('./public/css')); gulp.src('./images/*.png') @@ -26,6 +28,7 @@ gulp.task('copy', function() { gulp.task('bower', function() { return gulp.src(mainBowerFiles()) .pipe(concat('vendor.js')) + .pipe(rename({suffix: '.min'})) .pipe(gulp.dest('./public/js')) }); @@ -33,12 +36,14 @@ gulp.task('build-js', function() { return gulp.src('./js/**/*.js') .pipe(ngAnnotate()) .pipe(concat('main.js')) + .pipe(rename({suffix: '.min'})) .pipe(gulp.dest('./public/js')) }); gulp.task('template', function () { return gulp.src('./html/plugins/*.html') .pipe(templateCache('templates.js', {'root': 'plugins/', 'module': 'glancesApp'})) + .pipe(rename({suffix: '.min'})) .pipe(gulp.dest('./public/js')); }); diff --git a/glances/outputs/static/html/index.html b/glances/outputs/static/html/index.html index d6c8e55e..eec4fb70 100644 --- a/glances/outputs/static/html/index.html +++ b/glances/outputs/static/html/index.html @@ -8,13 +8,13 @@ - + - + - - - + + + diff --git a/glances/outputs/static/package.json b/glances/outputs/static/package.json index 2c4ce437..b5247938 100644 --- a/glances/outputs/static/package.json +++ b/glances/outputs/static/package.json @@ -8,6 +8,7 @@ "gulp-angular-templatecache": "^2.0.0", "gulp-concat": "^2.6.0", "gulp-ng-annotate": "^2.0.0", + "gulp-rename": "^1.2.2", "main-bower-files": "^2.13.1" }, "scripts": { diff --git a/glances/outputs/static/public/css/normalize.css b/glances/outputs/static/public/css/normalize.min.css similarity index 100% rename from glances/outputs/static/public/css/normalize.css rename to glances/outputs/static/public/css/normalize.min.css diff --git a/glances/outputs/static/public/css/style.css b/glances/outputs/static/public/css/style.min.css similarity index 100% rename from glances/outputs/static/public/css/style.css rename to glances/outputs/static/public/css/style.min.css diff --git a/glances/outputs/static/public/index.html b/glances/outputs/static/public/index.html index d6c8e55e..eec4fb70 100644 --- a/glances/outputs/static/public/index.html +++ b/glances/outputs/static/public/index.html @@ -8,13 +8,13 @@ - + - + - - - + + + diff --git a/glances/outputs/static/public/js/main.js b/glances/outputs/static/public/js/main.min.js similarity index 100% rename from glances/outputs/static/public/js/main.js rename to glances/outputs/static/public/js/main.min.js diff --git a/glances/outputs/static/public/js/templates.js b/glances/outputs/static/public/js/templates.min.js similarity index 100% rename from glances/outputs/static/public/js/templates.js rename to glances/outputs/static/public/js/templates.min.js diff --git a/glances/outputs/static/public/js/vendor.js b/glances/outputs/static/public/js/vendor.min.js similarity index 100% rename from glances/outputs/static/public/js/vendor.js rename to glances/outputs/static/public/js/vendor.min.js