Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2025-12-21 17:34:25 +04:00
Code Issues Projects Releases Wiki Activity

Fix bootstrap imports (#1477)

Browse Source
This commit is contained in:
SyntaxJoker
2023-02-21 14:38:27 +01:00
committed by GitHub
parent c7d7acb34b
commit 3ce568b5d1
7 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gulpfile.js
View File

@@ -177,6 +177,7 @@ gulp.task('sass', () => {
.src(argv.withPlugins || BUILD ? `${srcDir}/scss/!(_)*.scss` : `${srcDir}/scss/+(tabler|demo).scss`)
.pipe(debug())
.pipe(sass({
includePaths: ['node_modules'],
style: 'expanded',
precision: 7,
importer: (url, prev, done) => {

66
src/scss/_bootstrap-components.scss
View File

@@ -1,38 +1,38 @@
// Layout & components
@import "../../node_modules/bootstrap/scss/root";
@import "../../node_modules/bootstrap/scss/reboot";
@import "../../node_modules/bootstrap/scss/type";
@import "../../node_modules/bootstrap/scss/images";
@import "../../node_modules/bootstrap/scss/containers";
@import "../../node_modules/bootstrap/scss/grid";
@import "../../node_modules/bootstrap/scss/tables";
@import "../../node_modules/bootstrap/scss/forms";
@import "../../node_modules/bootstrap/scss/buttons";
@import "../../node_modules/bootstrap/scss/transitions";
@import "../../node_modules/bootstrap/scss/dropdown";
@import "../../node_modules/bootstrap/scss/button-group";
@import "../../node_modules/bootstrap/scss/nav";
@import "../../node_modules/bootstrap/scss/navbar";
@import "../../node_modules/bootstrap/scss/card";
@import "../../node_modules/bootstrap/scss/accordion";
@import "../../node_modules/bootstrap/scss/breadcrumb";
@import "../../node_modules/bootstrap/scss/pagination";
@import "../../node_modules/bootstrap/scss/badge";
@import "../../node_modules/bootstrap/scss/alert";
@import "../../node_modules/bootstrap/scss/progress";
@import "../../node_modules/bootstrap/scss/list-group";
@import "../../node_modules/bootstrap/scss/close";
@import "../../node_modules/bootstrap/scss/toasts";
@import "../../node_modules/bootstrap/scss/modal";
@import "../../node_modules/bootstrap/scss/tooltip";
@import "../../node_modules/bootstrap/scss/popover";
@import "../../node_modules/bootstrap/scss/carousel";
@import "../../node_modules/bootstrap/scss/spinners";
@import "../../node_modules/bootstrap/scss/offcanvas";
@import "../../node_modules/bootstrap/scss/placeholders";
@import "bootstrap/scss/root";
@import "bootstrap/scss/reboot";
@import "bootstrap/scss/type";
@import "bootstrap/scss/images";
@import "bootstrap/scss/containers";
@import "bootstrap/scss/grid";
@import "bootstrap/scss/tables";
@import "bootstrap/scss/forms";
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/transitions";
@import "bootstrap/scss/dropdown";
@import "bootstrap/scss/button-group";
@import "bootstrap/scss/nav";
@import "bootstrap/scss/navbar";
@import "bootstrap/scss/card";
@import "bootstrap/scss/accordion";
@import "bootstrap/scss/breadcrumb";
@import "bootstrap/scss/pagination";
@import "bootstrap/scss/badge";
@import "bootstrap/scss/alert";
@import "bootstrap/scss/progress";
@import "bootstrap/scss/list-group";
@import "bootstrap/scss/close";
@import "bootstrap/scss/toasts";
@import "bootstrap/scss/modal";
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/popover";
@import "bootstrap/scss/carousel";
@import "bootstrap/scss/spinners";
@import "bootstrap/scss/offcanvas";
@import "bootstrap/scss/placeholders";
// Helpers
@import "../../node_modules/bootstrap/scss/helpers";
@import "bootstrap/scss/helpers";
// Utilities
@import "../../node_modules/bootstrap/scss/utilities/api";
@import "bootstrap/scss/utilities/api";

12
src/scss/_bootstrap-config.scss
View File

@@ -1,7 +1,7 @@
// Config
@import "../../node_modules/bootstrap/scss/functions";
@import "../../node_modules/bootstrap/scss/variables";
@import "../../node_modules/bootstrap/scss/variables-dark";
@import "../../node_modules/bootstrap/scss/maps";
@import "../../node_modules/bootstrap/scss/mixins";
@import "../../node_modules/bootstrap/scss/utilities";
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/variables-dark";
@import "bootstrap/scss/maps";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/utilities";

2
src/scss/_config.scss
View File

@@ -1,4 +1,4 @@
@import "~bootstrap/scss/functions";
@import "bootstrap/scss/functions";
@import "variables";
@import "utilities";

2
src/scss/vendor/_jsvectormap.scss vendored
View File

@@ -1,4 +1,4 @@
@import "~jsvectormap/dist/css/jsvectormap";
@import "jsvectormap/dist/css/jsvectormap";
.jvm-tooltip {
background: $dark;

2
src/scss/vendor/_nouislider.scss vendored
View File

@@ -1,4 +1,4 @@
@import "~nouislider/dist/nouislider";
@import "nouislider/dist/nouislider";
.noUi-target {
border: 0;

2
src/scss/vendor/_tom-select.scss vendored
View File

@@ -2,7 +2,7 @@ $select-color-dropdown: #fff;
$select-color-dropdown-border-top: red;
$input-border-width: 1px;
@import "~tom-select/src/scss/tom-select.bootstrap5.scss";
@import "tom-select/src/scss/tom-select.bootstrap5.scss";
.ts-input {
color: inherit;