diff --git a/build/browsersync.js b/build/browsersync.js index 47d5d4f57..2f2220e48 100755 --- a/build/browsersync.js +++ b/build/browsersync.js @@ -6,8 +6,8 @@ bs.init({ server: { routes: { '/': 'tmp', - '/dist/fonts': 'fonts', '/dist': 'dist', + '/dist/fonts': 'fonts', '/libs': 'static/libs', '/img': 'static/img', }, diff --git a/build/scss-compile.js b/build/scss-compile.js index 724604ea6..f1ee59c70 100644 --- a/build/scss-compile.js +++ b/build/scss-compile.js @@ -6,9 +6,11 @@ const path = require('path'), sass = require("node-sass"); glob("scss/tabler*.scss", {}, function (er, files) { + console.log('files', files); + files.forEach(function(file){ var basename = path.basename(file, '.scss'); - + sass.render( { file: file, @@ -30,6 +32,8 @@ glob("scss/tabler*.scss", {}, function (er, files) { console.log(error); } }); + } else { + throw error; } } ); diff --git a/package.json b/package.json index 2ad633f46..05158db6e 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "dependencies": { "apexcharts": "3.8.0", "autosize": "4.0.2", - "bootstrap": "twbs/bootstrap#08bddb8", + "bootstrap": "twbs/bootstrap#fb475e9", "imask": "5.1.5", "selectize": "0.12.6" }, diff --git a/scss/ui/_inputs.custom.scss b/scss/ui/_inputs.custom.scss index 23cd3c196..f7d7aa606 100644 --- a/scss/ui/_inputs.custom.scss +++ b/scss/ui/_inputs.custom.scss @@ -79,7 +79,7 @@ Color Input width: 1.25rem; height: 1.25rem; content: ""; - background: $custom-checkbox-indicator-icon-checked no-repeat center center/50% 50%; + background: $form-switch-checked-bg-image no-repeat center center/50% 50%; opacity: 0; transition: .3s opacity; @@ -241,7 +241,7 @@ Image check pointer-events: none; content: ""; user-select: none; - background: $primary $custom-checkbox-indicator-icon-checked no-repeat center center/50% 50%; + background: $primary $form-switch-checked-bg-image no-repeat center center/50% 50%; border-radius: 3px; opacity: 0; transition: .3s opacity;