Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Make iCheck color followed by body theme"

Browse Source 
This reverts commit e4ae3c7130c4aa73cf276b451c763a533a78da82.
This commit is contained in:
printempw 2017-08-06 22:09:19 +08:00
parent 37654eb807
commit c25332008f
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gulpfile.js
View File

@ -18,8 +18,6 @@ var version = require('./package.json').version;
var srcPath = 'resources/assets/src'; var srcPath = 'resources/assets/src';
var distPath = 'resources/assets/dist'; var distPath = 'resources/assets/dist';
var skinColor = ['blue', 'yellow', 'green', 'purple', 'red', 'square'];
var vendorScripts = [ var vendorScripts = [
'jquery/dist/jquery.min.js', 'jquery/dist/jquery.min.js',
'bootstrap/dist/js/bootstrap.min.js', 'bootstrap/dist/js/bootstrap.min.js',
@ -41,16 +39,18 @@ var vendorStyles = [
'admin-lte/plugins/datatables/dataTables.bootstrap.css', 'admin-lte/plugins/datatables/dataTables.bootstrap.css',
'bootstrap-fileinput/css/fileinput.min.css', 'bootstrap-fileinput/css/fileinput.min.css',
'font-awesome/css/font-awesome.min.css', 'font-awesome/css/font-awesome.min.css',
'icheck/skins/square/blue.css',
'toastr/build/toastr.min.css', 'toastr/build/toastr.min.css',
'sweetalert2/dist/sweetalert2.min.css', 'sweetalert2/dist/sweetalert2.min.css',
].concat(skinColor.map((color) => `icheck/skins/square/${color}.css`)); ];
var styleReplacements = [ var styleReplacements = [
['blue.png', '"../images/blue.png"'],
['blue@2x.png', '"../images/blue@2x.png"'],
['../img/loading.gif', '"../images/loading.gif"'], ['../img/loading.gif', '"../images/loading.gif"'],
['../img/loading-sm.gif', '"../images/loading-sm.gif"'], ['../img/loading-sm.gif', '"../images/loading-sm.gif"'],
[/@import url\((.*)italic\);/g, ''], [/@import url\((.*)italic\);/g, ''],
].concat(skinColor.map((color) => [`${color}.png`, `"../images/${color}.png"`])) ];
.concat(skinColor.map((color) => [`${color}@2x.png`, `"../images/${color}@2x.png"`]));
var scriptReplacements = [ var scriptReplacements = [
['$.AdminLTE.layout.activate(),', ''] ['$.AdminLTE.layout.activate(),', '']
@ -63,11 +63,12 @@ var fonts = [
]; ];
var images = [ var images = [
'icheck/skins/square/blue.png',
'icheck/skins/square/blue@2x.png',
'resources/assets/src/images/**', 'resources/assets/src/images/**',
'bootstrap-fileinput/img/loading.gif', 'bootstrap-fileinput/img/loading.gif',
'bootstrap-fileinput/img/loading-sm.gif', 'bootstrap-fileinput/img/loading-sm.gif',
].concat(skinColor.map((color) => `icheck/skins/square/${color}.png`)) ];
.concat(skinColor.map((color) => `icheck/skins/square/${color}@2x.png`));
// aka. `yarn run build` // aka. `yarn run build`
gulp.task('default', ['build']); gulp.task('default', ['build']);
@ -151,9 +152,9 @@ gulp.task('clean', () => {
gulp.task('zip', () => { gulp.task('zip', () => {
clearCache(); clearCache();
console.info('============================================================================'); console.info("============================================================================");
console.info('= Don\'t forget to compile Sass & ES2015 files before publishing a release! ='); console.info("= Don't forget to compile Sass & ES2015 files before publishing a release! =");
console.info('============================================================================'); console.info("============================================================================");
let zipPath = `blessing-skin-server-v${version}.zip`; let zipPath = `blessing-skin-server-v${version}.zip`;

9
resources/assets/src/js/common/layout.js
View File

@ -19,7 +19,7 @@ $(document).ready(() => {
$('li.active > ul').show(); $('li.active > ul').show();
$('input').iCheck({ $('input').iCheck({
checkboxClass: `icheckbox_square${getColorScheme()}` checkboxClass: 'icheckbox_square-blue'
}); });
swal.setDefaults({ swal.setDefaults({
@ -34,10 +34,3 @@ function activateLayout() {
$.AdminLTE.layout.activate(); $.AdminLTE.layout.activate();
} }
function getColorScheme() {
const color = /skin-(\w+)(?:-light)? sidebar-mini/.exec(
document.getElementsByTagName('body')[0].className
)[1];
return color === 'black' ? '' : `-${color}`;
}