Browse Source

Fix jquery ui base styles broken image paths

Denis K 8 years ago
parent
commit
1f4714a90a
28 changed files with 29 additions and 786 deletions
  1. 27 5
      gulpfile.js
  2. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  3. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_diagonals-thick_20_666666_40x40.png
  4. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
  5. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_flat_10_000000_40x100.png
  6. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
  7. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_100_f6f6f6_1x400.png
  8. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_100_fdf5ce_1x400.png
  9. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
  10. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
  11. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
  12. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
  13. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
  14. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  15. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  16. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  17. BIN
      jet/static/jet/css/jquery-ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  18. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_222222_256x240.png
  19. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_228ef1_256x240.png
  20. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_2e83ff_256x240.png
  21. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_454545_256x240.png
  22. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_888888_256x240.png
  23. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png
  24. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_ef8c08_256x240.png
  25. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_ffd27a_256x240.png
  26. BIN
      jet/static/jet/css/jquery-ui/images/ui-icons_ffffff_256x240.png
  27. 0 780
      jet/static/jet/css/vendor.css
  28. 2 1
      package.json

+ 27 - 5
gulpfile.js

@@ -3,7 +3,7 @@ require('es6-promise').polyfill();
 var gulp = require('gulp'),
     browserify = require('browserify'),
     concatCss = require('gulp-concat-css'),
-    minifyCss = require('gulp-minify-css'),
+    cleanCSS = require('gulp-clean-css'),
     sass = require('gulp-sass'),
     uglify = require('gulp-uglify'),
     buffer = require('vinyl-buffer'),
@@ -13,7 +13,8 @@ var gulp = require('gulp'),
     postcss = require('gulp-postcss'),
     pxtorem = require('postcss-pxtorem'),
     autoprefixer = require('autoprefixer'),
-    shell = require('gulp-shell');
+    shell = require('gulp-shell'),
+    replace = require('gulp-replace');
 
 var cssProcessors = [
     autoprefixer(),
@@ -54,12 +55,31 @@ gulp.task('styles', function() {
 });
 
 gulp.task('vendor-styles', function() {
+    gulp.src('./node_modules/jquery-ui/themes/base/images/*')
+        .pipe(gulp.dest('./jet/static/jet/css/jquery-ui/images/'));
+
     merge(
         gulp.src([
             './node_modules/select2/dist/css/select2.css',
-            './node_modules/jquery-ui/themes/base/all.css',
             './node_modules/timepicker/jquery.ui.timepicker.css'
         ]),
+        gulp.src([
+            './node_modules/jquery-ui/themes/base/all.css'
+        ])
+            .pipe(cleanCSS()) // needed to remove jQuery UI comments breaking concatCss
+            .on('error', function(error) {
+                console.error(error);
+            })
+            .pipe(concatCss('jquery-ui.css', {
+                rebaseUrls: false
+            }))
+            .on('error', function(error) {
+                console.error(error);
+            })
+            .pipe(replace('images/', 'jquery-ui/images/'))
+            .on('error', function(error) {
+                console.error(error);
+            }),
         gulp.src([
             './node_modules/perfect-scrollbar/src/css/main.scss'
         ])
@@ -74,11 +94,13 @@ gulp.task('vendor-styles', function() {
         .on('error', function(error) {
             console.error(error);
         })
-        .pipe(minifyCss())
+        .pipe(concatCss('vendor.css', {
+            rebaseUrls: false
+        }))
         .on('error', function(error) {
             console.error(error);
         })
-        .pipe(concatCss('vendor.css'))
+        .pipe(cleanCSS())
         .on('error', function(error) {
             console.error(error);
         })

BIN
jet/static/jet/css/jquery-ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_diagonals-thick_20_666666_40x40.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_flat_10_000000_40x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_100_f6f6f6_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_100_fdf5ce_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_222222_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_228ef1_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_2e83ff_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_454545_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_888888_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_cd0a0a_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_ef8c08_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_ffd27a_256x240.png


BIN
jet/static/jet/css/jquery-ui/images/ui-icons_ffffff_256x240.png


File diff suppressed because it is too large
+ 0 - 780
jet/static/jet/css/vendor.css


+ 2 - 1
package.json

@@ -6,9 +6,10 @@
     "browsernizr": "2.1.0",
     "es6-promise": "3.2.1",
     "gulp": "3.9.1",
+    "gulp-clean-css": "2.0.12",
     "gulp-concat-css": "2.3.0",
-    "gulp-minify-css": "1.2.4",
     "gulp-postcss": "6.1.1",
+    "gulp-replace": "0.5.4",
     "gulp-sass": "2.3.2",
     "gulp-shell": "0.5.2",
     "gulp-sourcemaps": "1.6.0",

Some files were not shown because too many files changed in this diff