chore: add include scss files
parent
4033d631f9
commit
ff30bbcf3e
|
@ -19,10 +19,6 @@ jobs:
|
||||||
ref: demo-blur
|
ref: demo-blur
|
||||||
- name: npm install, gulp, build
|
- name: npm install, gulp, build
|
||||||
run: |
|
run: |
|
||||||
npm config set spin false
|
|
||||||
npm install -g npm@3
|
|
||||||
npm install -g gulp
|
|
||||||
npm install -g bower
|
|
||||||
npm install
|
npm install
|
||||||
gulp build
|
gulp build
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
var gulp = require('gulp');
|
var gulp = require('gulp');
|
||||||
|
var sass = require('gulp-sass');
|
||||||
var conf = require('./conf');
|
var conf = require('./conf');
|
||||||
|
|
||||||
var browserSync = require('browser-sync');
|
var browserSync = require('browser-sync');
|
||||||
|
@ -34,7 +35,6 @@ var buildStyles = function () {
|
||||||
|
|
||||||
var injectFiles = gulp.src([
|
var injectFiles = gulp.src([
|
||||||
path.join(conf.paths.src, '/sass/**/_*.scss'),
|
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/404.scss'),
|
||||||
'!' + path.join(conf.paths.src, '/sass/auth.scss')
|
'!' + path.join(conf.paths.src, '/sass/auth.scss')
|
||||||
], {read: false});
|
], {read: false});
|
||||||
|
@ -58,6 +58,7 @@ var buildStyles = function () {
|
||||||
.pipe($.sass(sassOptions)).on('error', conf.errorHandler('Sass'))
|
.pipe($.sass(sassOptions)).on('error', conf.errorHandler('Sass'))
|
||||||
.pipe($.autoprefixer()).on('error', conf.errorHandler('Autoprefixer'))
|
.pipe($.autoprefixer()).on('error', conf.errorHandler('Autoprefixer'))
|
||||||
.pipe($.sourcemaps.write())
|
.pipe($.sourcemaps.write())
|
||||||
|
.pipe(sass({outputStyle: 'compressed'}))
|
||||||
.pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/')));
|
.pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/')));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
"name": "blur_admin",
|
"name": "blur_admin",
|
||||||
"version": "1.3.1",
|
"version": "1.3.1",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"bower": "~1.8.4",
|
||||||
"browser-sync": "~2.18.2",
|
"browser-sync": "~2.18.2",
|
||||||
"browser-sync-spa": "~1.0.3",
|
"browser-sync-spa": "~1.0.3",
|
||||||
"chalk": "~1.1.1",
|
"chalk": "~1.1.1",
|
||||||
|
@ -27,7 +28,7 @@
|
||||||
"gulp-replace": "~0.5.4",
|
"gulp-replace": "~0.5.4",
|
||||||
"gulp-rev": "~7.1.2",
|
"gulp-rev": "~7.1.2",
|
||||||
"gulp-rev-replace": "~0.4.2",
|
"gulp-rev-replace": "~0.4.2",
|
||||||
"gulp-sass": "~2.3.2",
|
"gulp-sass": "^4.0.1",
|
||||||
"gulp-shell": "^0.5.2",
|
"gulp-shell": "^0.5.2",
|
||||||
"gulp-size": "~2.1.0",
|
"gulp-size": "~2.1.0",
|
||||||
"gulp-sourcemaps": "~1.6.0",
|
"gulp-sourcemaps": "~1.6.0",
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" ng-app="BlurAdmin">
|
<html lang="en" ng-app="BlurAdmin">
|
||||||
<head>
|
<head>
|
||||||
|
<!-- Google Tag Manager -->
|
||||||
|
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
|
||||||
|
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
|
||||||
|
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
|
||||||
|
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
|
||||||
|
})(window,document,'script','dataLayer','GTM-KT9L237');</script>
|
||||||
|
<!-- End Google Tag Manager -->
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
@ -25,6 +32,10 @@
|
||||||
<!-- endbuild -->
|
<!-- endbuild -->
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<!-- Google Tag Manager (noscript) -->
|
||||||
|
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KT9L237"
|
||||||
|
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
|
||||||
|
<!-- End Google Tag Manager (noscript) -->
|
||||||
<div class="body-bg"></div>
|
<div class="body-bg"></div>
|
||||||
<main ng-if="$pageFinishedLoading" ng-class="{ 'menu-collapsed': $baSidebarService.isMenuCollapsed() }">
|
<main ng-if="$pageFinishedLoading" ng-class="{ 'menu-collapsed': $baSidebarService.isMenuCollapsed() }">
|
||||||
|
|
||||||
|
@ -76,4 +87,4 @@
|
||||||
<!-- endbuild -->
|
<!-- endbuild -->
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
|
@ -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';
|
|
@ -1,4 +1,15 @@
|
||||||
@import 'common';
|
@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
|
// injector
|
||||||
// endinjector
|
// endinjector
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
@import 'blur-admin-theme';
|
||||||
|
@import 'buttons';
|
||||||
|
@import 'datePicker';
|
||||||
|
@import 'icons';
|
||||||
|
@import 'layout';
|
||||||
|
@import 'preloader';
|
||||||
|
@import 'socicon';
|
||||||
|
@import 'table';
|
||||||
|
@import 'tree';
|
|
@ -0,0 +1,9 @@
|
||||||
|
@import 'accordion';
|
||||||
|
@import 'backTop';
|
||||||
|
@import 'baWizard';
|
||||||
|
@import 'contentTop';
|
||||||
|
@import 'msgCenter';
|
||||||
|
@import 'pageTop';
|
||||||
|
@import 'progressRound';
|
||||||
|
@import 'sidebar';
|
||||||
|
@import 'widgets';
|
|
@ -0,0 +1,10 @@
|
||||||
|
@import 'amChart';
|
||||||
|
@import 'amChartMap';
|
||||||
|
@import 'blurFeed';
|
||||||
|
@import 'calendar';
|
||||||
|
@import 'pieCharts';
|
||||||
|
@import 'popularApp';
|
||||||
|
@import 'timeline';
|
||||||
|
@import 'todo';
|
||||||
|
@import 'trafficChart';
|
||||||
|
@import 'weather';
|
Loading…
Reference in New Issue