Merge branch 'dev' into module_profiler
This commit is contained in:
+23
-23
@@ -1,6 +1,19 @@
|
||||
var elixir = require ('laravel-elixir');
|
||||
|
||||
require ('laravel-elixir-remove')
|
||||
|
||||
elixir (function (mix) {
|
||||
var defaultColor = "green";
|
||||
var colors = ["blue", "seagreen", 'orange', "green", 'purple', 'red'];
|
||||
var outputName;
|
||||
colors.forEach (function (color) {
|
||||
outputName = color === defaultColor ? 'app.css' : 'app-' + color + ".css";
|
||||
mix.copy ('resources/assets/sass/admin/_themes/' + color + '-theme.scss', 'public/css/admin/theme.scss')
|
||||
.sass ([
|
||||
'admin/**/!(_imports|_variables|*-theme)*.scss',
|
||||
'../admin/css'
|
||||
], 'public/css/admin/' + outputName, null, {includePaths: ['bower_components', 'resources/assets/sass/admin']})
|
||||
})
|
||||
|
||||
// vendor files
|
||||
mix
|
||||
@@ -13,27 +26,14 @@ elixir (function (mix) {
|
||||
'tinycolor/dist/tinycolor-min.js',
|
||||
'chart.js/dist/Chart.bundle.min.js',
|
||||
'jquery.are-you-sure/jquery.are-you-sure.js',
|
||||
'../resources/assets/admin/js/app.js',
|
||||
], 'public/js/vendor.js', 'bower_components');
|
||||
|
||||
var defaultColor = "green";
|
||||
var colors = ["blue", "seagreen", 'orange', "green", 'purple', 'red'];
|
||||
var outputName;
|
||||
colors.forEach (function (color) {
|
||||
outputName = color == defaultColor ? 'app.css' : 'app-' + color + ".css";
|
||||
mix.copy ('resources/assets/sass/admin/_themes/' + color + '-theme.scss', 'public/css/admin/theme.scss');
|
||||
mix.sass ([
|
||||
'admin/**/!(_imports|_variables|*-theme)*.scss',
|
||||
'../admin/css/custom.css'
|
||||
|
||||
], 'public/css/admin/' + outputName, null, {includePaths: ['bower_components', 'resources/assets/sass/admin']});
|
||||
})
|
||||
|
||||
mix.copy ('bower_components/font-awesome/css/font-awesome.min.css', 'public/css');
|
||||
mix.copy ('bower_components/font-awesome/fonts', 'public/fonts');
|
||||
mix.sass (['bootstrap/bootstrap.scss'], 'public/css/admin/bootstrap.css');
|
||||
mix.styles ([
|
||||
'../../../public/css/admin/bootstrap.css',
|
||||
'../../../bower_components/animate.css/animate.css',
|
||||
], 'public/css/admin/style.css');
|
||||
'../resources/assets/admin/js/*.js',
|
||||
], 'public/js/vendor.js', 'bower_components')
|
||||
.copy ('bower_components/font-awesome/css/font-awesome.min.css', 'public/css')
|
||||
.copy ('bower_components/font-awesome/fonts', 'public/fonts')
|
||||
.sass (['bootstrap/bootstrap.scss'], 'public/css/admin/bootstrap.css')
|
||||
.styles ([
|
||||
'../../../public/css/admin/bootstrap.css',
|
||||
'../../../bower_components/animate.css/animate.css',
|
||||
], 'public/css/admin/style.css')
|
||||
.remove ('public/css/admin/theme.scss');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user