diff --git a/.github/workflows/azureCliDeployBlur.yml b/.github/workflows/azureCliDeployBlur.yml index 39ec616..1827aaf 100644 --- a/.github/workflows/azureCliDeployBlur.yml +++ b/.github/workflows/azureCliDeployBlur.yml @@ -19,10 +19,6 @@ jobs: ref: demo-blur - name: npm install, gulp, build run: | - npm config set spin false - npm install -g npm@3 - npm install -g gulp - npm install -g bower npm install gulp build diff --git a/gulp/styles.js b/gulp/styles.js index a744fab..ebd0c1c 100644 --- a/gulp/styles.js +++ b/gulp/styles.js @@ -2,6 +2,7 @@ var path = require('path'); var gulp = require('gulp'); +var sass = require('gulp-sass'); var conf = require('./conf'); var browserSync = require('browser-sync'); @@ -34,7 +35,6 @@ var buildStyles = function () { var injectFiles = gulp.src([ path.join(conf.paths.src, '/sass/**/_*.scss'), - '!' + path.join(conf.paths.src, '/sass/theme/conf/**/*.scss'), '!' + path.join(conf.paths.src, '/sass/404.scss'), '!' + path.join(conf.paths.src, '/sass/auth.scss') ], {read: false}); @@ -58,6 +58,7 @@ var buildStyles = function () { .pipe($.sass(sassOptions)).on('error', conf.errorHandler('Sass')) .pipe($.autoprefixer()).on('error', conf.errorHandler('Autoprefixer')) .pipe($.sourcemaps.write()) + .pipe(sass({outputStyle: 'compressed'})) .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/'))); }; diff --git a/package.json b/package.json index d3a2247..4735a46 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "blur_admin", "version": "1.3.1", "devDependencies": { + "bower": "~1.8.4", "browser-sync": "~2.18.2", "browser-sync-spa": "~1.0.3", "chalk": "~1.1.1", @@ -27,7 +28,7 @@ "gulp-replace": "~0.5.4", "gulp-rev": "~7.1.2", "gulp-rev-replace": "~0.4.2", - "gulp-sass": "~2.3.2", + "gulp-sass": "^4.0.1", "gulp-shell": "^0.5.2", "gulp-size": "~2.1.0", "gulp-sourcemaps": "~1.6.0", diff --git a/src/index.html b/src/index.html index c3fa4f7..1cf2f19 100644 --- a/src/index.html +++ b/src/index.html @@ -1,6 +1,13 @@ + + + @@ -25,6 +32,10 @@ + + +
@@ -76,4 +87,4 @@ - + \ No newline at end of file diff --git a/src/sass/app/_index.scss b/src/sass/app/_index.scss new file mode 100644 index 0000000..f8a824d --- /dev/null +++ b/src/sass/app/_index.scss @@ -0,0 +1,18 @@ +@import 'alerts'; +@import 'buttonsPage'; +@import 'chartsPage'; +@import 'dashboard'; +@import 'email'; +@import 'form'; +@import 'grid'; +@import 'iconsPage'; +@import 'modalNotifications'; +@import 'modals'; +@import 'notifications'; +@import 'profile'; +@import 'slider'; +@import 'table'; +@import 'tabsPage'; +@import 'tplSkinPanel'; +@import 'tree'; +@import 'typography'; diff --git a/src/sass/main.scss b/src/sass/main.scss index f8ffe2d..e0ae485 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -1,4 +1,15 @@ @import 'common'; +@import 'theme/bootstrap-overrides/panel'; +@import 'theme/bootstrap-overrides/tabs'; + +@import 'theme/components/index'; + +@import 'theme/dashboard/index'; + +@import 'theme/index'; + +@import 'app/index'; + // injector -// endinjector \ No newline at end of file +// endinjector diff --git a/src/sass/theme/_index.scss b/src/sass/theme/_index.scss new file mode 100644 index 0000000..765805c --- /dev/null +++ b/src/sass/theme/_index.scss @@ -0,0 +1,9 @@ +@import 'blur-admin-theme'; +@import 'buttons'; +@import 'datePicker'; +@import 'icons'; +@import 'layout'; +@import 'preloader'; +@import 'socicon'; +@import 'table'; +@import 'tree'; diff --git a/src/sass/theme/components/_index.scss b/src/sass/theme/components/_index.scss new file mode 100644 index 0000000..4d4cf51 --- /dev/null +++ b/src/sass/theme/components/_index.scss @@ -0,0 +1,9 @@ +@import 'accordion'; +@import 'backTop'; +@import 'baWizard'; +@import 'contentTop'; +@import 'msgCenter'; +@import 'pageTop'; +@import 'progressRound'; +@import 'sidebar'; +@import 'widgets'; diff --git a/src/sass/theme/dashboard/_index.scss b/src/sass/theme/dashboard/_index.scss new file mode 100644 index 0000000..c5e05a9 --- /dev/null +++ b/src/sass/theme/dashboard/_index.scss @@ -0,0 +1,10 @@ +@import 'amChart'; +@import 'amChartMap'; +@import 'blurFeed'; +@import 'calendar'; +@import 'pieCharts'; +@import 'popularApp'; +@import 'timeline'; +@import 'todo'; +@import 'trafficChart'; +@import 'weather';