diff --git a/gulp/images.js b/gulp/images.js new file mode 100644 index 0000000..a1c2280 --- /dev/null +++ b/gulp/images.js @@ -0,0 +1,15 @@ +'use strict'; + +var path = require('path'); +var gulp = require('gulp'); +var conf = require('./conf'); + +gulp.task('copyVendorImages',function () { + return gulp.src([ + path.join(conf.wiredep.directory, '**/ammap/dist/ammap/images/**/*'), + path.join(conf.wiredep.directory, '**/amcharts/dist/amcharts/images/**/*'), + path.join(conf.wiredep.directory, '**/ionrangeslider/img/**/*') + ]) + .pipe(gulp.dest(path.join(conf.paths.dist, '/assets/img/theme/vendor'))); +}); + diff --git a/gulp/inject.js b/gulp/inject.js index 34c577c..05bf008 100644 --- a/gulp/inject.js +++ b/gulp/inject.js @@ -15,7 +15,7 @@ gulp.task('inject-reload', ['inject'], function () { browserSync.reload(); }); -gulp.task('inject', ['scripts', 'styles', 'injectAuth', 'inject404'], function () { +gulp.task('inject', ['scripts', 'styles', 'injectAuth', 'inject404', 'copyVendorImages'], function () { var injectStyles = gulp.src([ path.join(conf.paths.tmp, '/serve/app/main.css'), path.join('!' + conf.paths.tmp, '/serve/app/vendor.css') diff --git a/src/app/theme/theme.constants.js b/src/app/theme/theme.constants.js index 0c492d9..4957c50 100644 --- a/src/app/theme/theme.constants.js +++ b/src/app/theme/theme.constants.js @@ -48,8 +48,8 @@ images: { root: IMAGES_ROOT, profile: IMAGES_ROOT + 'app/profile/', - amMap: 'assets/img/theme/vendor/ammap/', - amChart: 'assets/img/theme/vendor/amchart/' + amMap: 'assets/img/theme/vendor/ammap//dist/ammap/images/', + amChart: 'assets/img/theme/vendor/amcharts/dist/amcharts/images/' } }); diff --git a/src/assets/img/theme/vendor/amchart/dragIcon.gif b/src/assets/img/theme/vendor/amchart/dragIcon.gif deleted file mode 100644 index f11ed93..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIcon.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconBlack.gif b/src/assets/img/theme/vendor/amchart/dragIconBlack.gif deleted file mode 100644 index 52301cf..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconBlack.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconH.gif b/src/assets/img/theme/vendor/amchart/dragIconH.gif deleted file mode 100644 index 686c45c..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconH.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconHBlack.gif b/src/assets/img/theme/vendor/amchart/dragIconHBlack.gif deleted file mode 100644 index 3d65e46..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconHBlack.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectBig.png b/src/assets/img/theme/vendor/amchart/dragIconRectBig.png deleted file mode 100644 index e57ef66..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectBig.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectBigBlack.png b/src/assets/img/theme/vendor/amchart/dragIconRectBigBlack.png deleted file mode 100644 index 0d575c8..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectBigBlack.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectBigBlackH.png b/src/assets/img/theme/vendor/amchart/dragIconRectBigBlackH.png deleted file mode 100644 index 1dfd3f2..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectBigBlackH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectBigH.png b/src/assets/img/theme/vendor/amchart/dragIconRectBigH.png deleted file mode 100644 index 71dbfc2..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectBigH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectSmall.png b/src/assets/img/theme/vendor/amchart/dragIconRectSmall.png deleted file mode 100644 index 21e413e..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectSmall.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectSmallBlack.png b/src/assets/img/theme/vendor/amchart/dragIconRectSmallBlack.png deleted file mode 100644 index ad10255..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectSmallBlack.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectSmallBlackH.png b/src/assets/img/theme/vendor/amchart/dragIconRectSmallBlackH.png deleted file mode 100644 index feb6527..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectSmallBlackH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRectSmallH.png b/src/assets/img/theme/vendor/amchart/dragIconRectSmallH.png deleted file mode 100644 index 9367474..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRectSmallH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundBig.png b/src/assets/img/theme/vendor/amchart/dragIconRoundBig.png deleted file mode 100644 index 794796a..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundBig.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundBigBlack.png b/src/assets/img/theme/vendor/amchart/dragIconRoundBigBlack.png deleted file mode 100644 index 047930f..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundBigBlack.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundBigBlackH.png b/src/assets/img/theme/vendor/amchart/dragIconRoundBigBlackH.png deleted file mode 100644 index 5412005..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundBigBlackH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundBigH.png b/src/assets/img/theme/vendor/amchart/dragIconRoundBigH.png deleted file mode 100644 index 5cbee67..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundBigH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundSmall.png b/src/assets/img/theme/vendor/amchart/dragIconRoundSmall.png deleted file mode 100644 index 05703eb..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundSmall.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundSmallBlack.png b/src/assets/img/theme/vendor/amchart/dragIconRoundSmallBlack.png deleted file mode 100644 index 76c07d2..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundSmallBlack.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundSmallBlackH.png b/src/assets/img/theme/vendor/amchart/dragIconRoundSmallBlackH.png deleted file mode 100644 index e7efe46..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundSmallBlackH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/dragIconRoundSmallH.png b/src/assets/img/theme/vendor/amchart/dragIconRoundSmallH.png deleted file mode 100644 index e04163d..0000000 Binary files a/src/assets/img/theme/vendor/amchart/dragIconRoundSmallH.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/export.png b/src/assets/img/theme/vendor/amchart/export.png deleted file mode 100644 index 16435ab..0000000 Binary files a/src/assets/img/theme/vendor/amchart/export.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/exportWhite.png b/src/assets/img/theme/vendor/amchart/exportWhite.png deleted file mode 100644 index fab0b42..0000000 Binary files a/src/assets/img/theme/vendor/amchart/exportWhite.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/lens.png b/src/assets/img/theme/vendor/amchart/lens.png deleted file mode 100644 index 439feed..0000000 Binary files a/src/assets/img/theme/vendor/amchart/lens.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/lensWhite.png b/src/assets/img/theme/vendor/amchart/lensWhite.png deleted file mode 100644 index 68408fa..0000000 Binary files a/src/assets/img/theme/vendor/amchart/lensWhite.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/lensWhite_old.png b/src/assets/img/theme/vendor/amchart/lensWhite_old.png deleted file mode 100644 index 2434fd6..0000000 Binary files a/src/assets/img/theme/vendor/amchart/lensWhite_old.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/amchart/lens_old.png b/src/assets/img/theme/vendor/amchart/lens_old.png deleted file mode 100644 index 8dcfcae..0000000 Binary files a/src/assets/img/theme/vendor/amchart/lens_old.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/arrowDown.gif b/src/assets/img/theme/vendor/ammap/arrowDown.gif deleted file mode 100755 index 68d7db6..0000000 Binary files a/src/assets/img/theme/vendor/ammap/arrowDown.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/arrowUp.gif b/src/assets/img/theme/vendor/ammap/arrowUp.gif deleted file mode 100755 index f579315..0000000 Binary files a/src/assets/img/theme/vendor/ammap/arrowUp.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/export.png b/src/assets/img/theme/vendor/ammap/export.png deleted file mode 100755 index 259e322..0000000 Binary files a/src/assets/img/theme/vendor/ammap/export.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/homeIcon.gif b/src/assets/img/theme/vendor/ammap/homeIcon.gif deleted file mode 100755 index f753b69..0000000 Binary files a/src/assets/img/theme/vendor/ammap/homeIcon.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/homeIconWhite.gif b/src/assets/img/theme/vendor/ammap/homeIconWhite.gif deleted file mode 100755 index acd3e81..0000000 Binary files a/src/assets/img/theme/vendor/ammap/homeIconWhite.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/minus.gif b/src/assets/img/theme/vendor/ammap/minus.gif deleted file mode 100755 index 022fa1d..0000000 Binary files a/src/assets/img/theme/vendor/ammap/minus.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/panDown.gif b/src/assets/img/theme/vendor/ammap/panDown.gif deleted file mode 100755 index b2a0260..0000000 Binary files a/src/assets/img/theme/vendor/ammap/panDown.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/panLeft.gif b/src/assets/img/theme/vendor/ammap/panLeft.gif deleted file mode 100755 index 4cd7a15..0000000 Binary files a/src/assets/img/theme/vendor/ammap/panLeft.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/panRight.gif b/src/assets/img/theme/vendor/ammap/panRight.gif deleted file mode 100755 index 7c8cd6c..0000000 Binary files a/src/assets/img/theme/vendor/ammap/panRight.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/panUp.gif b/src/assets/img/theme/vendor/ammap/panUp.gif deleted file mode 100755 index af29315..0000000 Binary files a/src/assets/img/theme/vendor/ammap/panUp.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/plus.gif b/src/assets/img/theme/vendor/ammap/plus.gif deleted file mode 100755 index 412c2bb..0000000 Binary files a/src/assets/img/theme/vendor/ammap/plus.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/xIcon.gif b/src/assets/img/theme/vendor/ammap/xIcon.gif deleted file mode 100755 index c66aad9..0000000 Binary files a/src/assets/img/theme/vendor/ammap/xIcon.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/ammap/xIconH.gif b/src/assets/img/theme/vendor/ammap/xIconH.gif deleted file mode 100755 index ae2b919..0000000 Binary files a/src/assets/img/theme/vendor/ammap/xIconH.gif and /dev/null differ diff --git a/src/assets/img/theme/vendor/leaflet/layers-2x.png b/src/assets/img/theme/vendor/leaflet/layers-2x.png deleted file mode 100644 index a2cf7f9..0000000 Binary files a/src/assets/img/theme/vendor/leaflet/layers-2x.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/leaflet/layers.png b/src/assets/img/theme/vendor/leaflet/layers.png deleted file mode 100644 index bca0a0e..0000000 Binary files a/src/assets/img/theme/vendor/leaflet/layers.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/leaflet/marker-icon-2x.png b/src/assets/img/theme/vendor/leaflet/marker-icon-2x.png deleted file mode 100644 index 0015b64..0000000 Binary files a/src/assets/img/theme/vendor/leaflet/marker-icon-2x.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/leaflet/marker-icon.png b/src/assets/img/theme/vendor/leaflet/marker-icon.png deleted file mode 100644 index e2e9f75..0000000 Binary files a/src/assets/img/theme/vendor/leaflet/marker-icon.png and /dev/null differ diff --git a/src/assets/img/theme/vendor/leaflet/marker-shadow.png b/src/assets/img/theme/vendor/leaflet/marker-shadow.png deleted file mode 100644 index d1e773c..0000000 Binary files a/src/assets/img/theme/vendor/leaflet/marker-shadow.png and /dev/null differ diff --git a/src/sass/app/_slider.scss b/src/sass/app/_slider.scss index 44ff7cd..3dfca03 100644 --- a/src/sass/app/_slider.scss +++ b/src/sass/app/_slider.scss @@ -1,3 +1,13 @@ .slider-box{ min-height: 86px; +} + +.irs-bar, +.irs-bar-edge, +.irs-line-left, +.irs-line-mid, +.irs-line-right, +.irs-slider { + background-image: url(../assets/img/theme/vendor/ionrangeslider/img/sprite-skin-flat.png); + background-repeat: repeat-x; } \ No newline at end of file