From 03288fe6fbdcbdd568f67114578d13c4ba0b448a Mon Sep 17 00:00:00 2001 From: Vladimir Lugovsky Date: Wed, 6 Jan 2016 17:21:17 +0300 Subject: [PATCH] refactor(build): build changes so it would be possible to deploy template --- bower.json | 10 +++++++- gulp/build.js | 4 +-- src/app/pages/tables/basic/tables.html | 24 +++++++++--------- src/app/pages/tables/smart/tables.html | 12 ++++----- .../img/app/skin-thumbnails}/01_default.jpg | Bin .../app/skin-thumbnails}/02_transparent.jpg | Bin .../img/app/skin-thumbnails}/03_blue.jpg | Bin .../img/app/skin-thumbnails}/04_peachy.jpg | Bin .../img/app/skin-thumbnails}/05_material.jpg | Bin .../img/app/skin-thumbnails}/06_transblue.jpg | Bin .../img/theme/timeline}/cd-icon-location.svg | 0 .../img/theme/timeline}/cd-icon-movie.svg | 0 .../img/theme/timeline}/cd-icon-picture.svg | 0 13 files changed, 29 insertions(+), 21 deletions(-) rename src/{app/tplSkin/thumbs => assets/img/app/skin-thumbnails}/01_default.jpg (100%) rename src/{app/tplSkin/thumbs => assets/img/app/skin-thumbnails}/02_transparent.jpg (100%) rename src/{app/tplSkin/thumbs => assets/img/app/skin-thumbnails}/03_blue.jpg (100%) rename src/{app/tplSkin/thumbs => assets/img/app/skin-thumbnails}/04_peachy.jpg (100%) rename src/{app/tplSkin/thumbs => assets/img/app/skin-thumbnails}/05_material.jpg (100%) rename src/{app/tplSkin/thumbs => assets/img/app/skin-thumbnails}/06_transblue.jpg (100%) rename src/{app/pages/dashboard/timeline/img => assets/img/theme/timeline}/cd-icon-location.svg (100%) rename src/{app/pages/dashboard/timeline/img => assets/img/theme/timeline}/cd-icon-movie.svg (100%) rename src/{app/pages/dashboard/timeline/img => assets/img/theme/timeline}/cd-icon-picture.svg (100%) diff --git a/bower.json b/bower.json index 88c322a..b45aa79 100644 --- a/bower.json +++ b/bower.json @@ -84,7 +84,15 @@ "main": "./jquery.slimscroll.js" }, "font-awesome": { - "main": "css/font-awesome.css" + "main": [ + "css/font-awesome.css", + "fonts/FontAwesome.otf", + "fonts/fontawesome-webfont.eot", + "fonts/fontawesome-webfont.svg", + "fonts/fontawesome-webfont.ttf", + "fonts/fontawesome-webfont.woff", + "fonts/fontawesome-webfont.woff2" + ] } } } diff --git a/gulp/build.js b/gulp/build.js index 87cc06a..fea762d 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -19,7 +19,7 @@ gulp.task('partials', function () { quotes: true })) .pipe($.angularTemplatecache('templateCacheHtml.js', { - module: '123', + module: 'BlurAdmin', root: 'app' })) .pipe(gulp.dest(conf.paths.tmp + '/partials/')); @@ -85,7 +85,7 @@ gulp.task('other', function () { return gulp.src([ path.join(conf.paths.src, '/**/*'), - path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss}') + path.join('!' + conf.paths.src, '/**/*.{html,css,js,scss,md}') ]) .pipe(fileFilter) .pipe(gulp.dest(path.join(conf.paths.dist, '/'))); diff --git a/src/app/pages/tables/basic/tables.html b/src/app/pages/tables/basic/tables.html index 28d167c..c57d68b 100644 --- a/src/app/pages/tables/basic/tables.html +++ b/src/app/pages/tables/basic/tables.html @@ -2,38 +2,38 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/src/app/pages/tables/smart/tables.html b/src/app/pages/tables/smart/tables.html index e05f3f4..a5e5be6 100644 --- a/src/app/pages/tables/smart/tables.html +++ b/src/app/pages/tables/smart/tables.html @@ -2,25 +2,25 @@
- +
- +
- +
- +
- +
- +
diff --git a/src/app/tplSkin/thumbs/01_default.jpg b/src/assets/img/app/skin-thumbnails/01_default.jpg similarity index 100% rename from src/app/tplSkin/thumbs/01_default.jpg rename to src/assets/img/app/skin-thumbnails/01_default.jpg diff --git a/src/app/tplSkin/thumbs/02_transparent.jpg b/src/assets/img/app/skin-thumbnails/02_transparent.jpg similarity index 100% rename from src/app/tplSkin/thumbs/02_transparent.jpg rename to src/assets/img/app/skin-thumbnails/02_transparent.jpg diff --git a/src/app/tplSkin/thumbs/03_blue.jpg b/src/assets/img/app/skin-thumbnails/03_blue.jpg similarity index 100% rename from src/app/tplSkin/thumbs/03_blue.jpg rename to src/assets/img/app/skin-thumbnails/03_blue.jpg diff --git a/src/app/tplSkin/thumbs/04_peachy.jpg b/src/assets/img/app/skin-thumbnails/04_peachy.jpg similarity index 100% rename from src/app/tplSkin/thumbs/04_peachy.jpg rename to src/assets/img/app/skin-thumbnails/04_peachy.jpg diff --git a/src/app/tplSkin/thumbs/05_material.jpg b/src/assets/img/app/skin-thumbnails/05_material.jpg similarity index 100% rename from src/app/tplSkin/thumbs/05_material.jpg rename to src/assets/img/app/skin-thumbnails/05_material.jpg diff --git a/src/app/tplSkin/thumbs/06_transblue.jpg b/src/assets/img/app/skin-thumbnails/06_transblue.jpg similarity index 100% rename from src/app/tplSkin/thumbs/06_transblue.jpg rename to src/assets/img/app/skin-thumbnails/06_transblue.jpg diff --git a/src/app/pages/dashboard/timeline/img/cd-icon-location.svg b/src/assets/img/theme/timeline/cd-icon-location.svg similarity index 100% rename from src/app/pages/dashboard/timeline/img/cd-icon-location.svg rename to src/assets/img/theme/timeline/cd-icon-location.svg diff --git a/src/app/pages/dashboard/timeline/img/cd-icon-movie.svg b/src/assets/img/theme/timeline/cd-icon-movie.svg similarity index 100% rename from src/app/pages/dashboard/timeline/img/cd-icon-movie.svg rename to src/assets/img/theme/timeline/cd-icon-movie.svg diff --git a/src/app/pages/dashboard/timeline/img/cd-icon-picture.svg b/src/assets/img/theme/timeline/cd-icon-picture.svg similarity index 100% rename from src/app/pages/dashboard/timeline/img/cd-icon-picture.svg rename to src/assets/img/theme/timeline/cd-icon-picture.svg