Skip to content

refactor: use upgraded sass-loader & more #2851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thecristen wants to merge 5 commits into
base: main
Choose a base branch
from
Open

refactor: use upgraded sass-loader & more #2851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72959a2
deps: update sass-loader
thecristen Dec 19, 2025
a553f26
npm audit fix
thecristen Dec 19, 2025
2436d31
no-op: browserslist db update
thecristen Dec 19, 2025
3d8dafc
refactor: use upgraded sass-loader
thecristen Dec 19, 2025
bc31aab
feat(webpack): hide warnings
thecristen Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions assets/css/_bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,55 @@
// Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

// Core variables and mixins
@import 'node_modules/bootstrap/scss/variables';
@import 'node_modules/bootstrap/scss/mixins';
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';

// Reset and dependencies
@import 'node_modules/bootstrap/scss/normalize';
@import 'node_modules/bootstrap/scss/print';
@import 'bootstrap/scss/normalize';
@import 'bootstrap/scss/print';

// Core CSS
@import 'node_modules/bootstrap/scss/reboot';
@import 'node_modules/bootstrap/scss/type';
@import 'node_modules/bootstrap/scss/images';
// @import 'node_modules/bootstrap/scss/code';
@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 'bootstrap/scss/reboot';
@import 'bootstrap/scss/type';
@import 'bootstrap/scss/images';
// @import 'bootstrap/scss/code';
@import 'bootstrap/scss/grid';
@import 'bootstrap/scss/tables';
@import 'bootstrap/scss/forms';
@import 'bootstrap/scss/buttons';

// Components
@import 'node_modules/bootstrap/scss/animation'; // has .collapse
@import 'node_modules/bootstrap/scss/dropdown';
@import 'node_modules/bootstrap/scss/button-group';
// @import 'node_modules/bootstrap/scss/input-group';
@import 'node_modules/bootstrap/scss/custom-forms';
// @import 'node_modules/bootstrap/scss/nav';
// @import 'node_modules/bootstrap/scss/navbar';
@import 'node_modules/bootstrap/scss/card';
// @import 'node_modules/bootstrap/scss/breadcrumb';
// @import 'node_modules/bootstrap/scss/pagination';
// @import 'node_modules/bootstrap/scss/pager';
// @import 'node_modules/bootstrap/scss/labels';
// @import 'node_modules/bootstrap/scss/jumbotron';
// @import 'node_modules/bootstrap/scss/alert';
// @import 'node_modules/bootstrap/scss/progress';
// @import 'node_modules/bootstrap/scss/media';
@import 'node_modules/bootstrap/scss/list-group';
@import 'node_modules/bootstrap/scss/responsive-embed';
// @import 'node_modules/bootstrap/scss/close';
@import 'bootstrap/scss/animation'; // has .collapse
@import 'bootstrap/scss/dropdown';
@import 'bootstrap/scss/button-group';
// @import 'bootstrap/scss/input-group';
@import 'bootstrap/scss/custom-forms';
// @import 'bootstrap/scss/nav';
// @import 'bootstrap/scss/navbar';
@import 'bootstrap/scss/card';
// @import 'bootstrap/scss/breadcrumb';
// @import 'bootstrap/scss/pagination';
// @import 'bootstrap/scss/pager';
// @import 'bootstrap/scss/labels';
// @import 'bootstrap/scss/jumbotron';
// @import 'bootstrap/scss/alert';
// @import 'bootstrap/scss/progress';
// @import 'bootstrap/scss/media';
@import 'bootstrap/scss/list-group';
@import 'bootstrap/scss/responsive-embed';
// @import 'bootstrap/scss/close';

// Components w/ JavaScript
@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 'bootstrap/scss/modal';
@import 'bootstrap/scss/tooltip';
// @import 'bootstrap/scss/popover';
// @import 'bootstrap/scss/carousel';

// Utility classes
@import 'node_modules/bootstrap/scss/utilities';
@import 'node_modules/bootstrap/scss/utilities-background';
@import 'node_modules/bootstrap/scss/utilities-spacing';
@import 'node_modules/bootstrap/scss/utilities-responsive';
@import 'bootstrap/scss/utilities';
@import 'bootstrap/scss/utilities-background';
@import 'bootstrap/scss/utilities-spacing';
@import 'bootstrap/scss/utilities-responsive';

// Overrides
.c-select {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/_schedule.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'variables';
@import 'table';
@import 'buttons';
@import 'vendor/sass-svg-uri/svg-uri';
@import '../vendor/sass-svg-uri/svg-uri';

.schedule__route-name {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $container-max-widths: (
xxl: map.get($grid-breakpoints, xxl) - (18px * 8)
);

@import 'node_modules/bootstrap/scss/variables';
@import "bootstrap/scss/variables";
$spacers: (
0: (
x: 0,
Expand Down
10 changes: 5 additions & 5 deletions assets/css/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ svg[class*="fill"] > path[fill]:not([fill="none"]) {
@import 'functions';
@import 'variables';
@import 'mixins';
@import 'node_modules/bootstrap/scss/variables';
@import 'node_modules/bootstrap/scss/mixins';
@import 'vendor/fontawesome';
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';
@import '../vendor/fontawesome';
@import 'typography';

////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
//
// VENDOR STYLES
//
@import 'vendor/accessible-date-picker';
@import '../vendor/accessible-date-picker';
@import 'datepicker'; // our overrides of datepicker styles (can't use BEM conventions)

////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -170,5 +170,5 @@ svg[class*="fill"] > path[fill]:not([fill="none"]) {
// They may use nesting and even !important when absolutely necessary. These styles
// should be used VERY sparingly and be well-documented.
//
@import 'vendor/fixedsticky'; // needs refactor
@import '../vendor/fixedsticky'; // needs refactor
@import 'utilities';
2 changes: 1 addition & 1 deletion assets/css/core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@import 'footer';
@import 'header';
@import 'page';
@import 'vendor/fontawesome';
@import '../vendor/fontawesome';
@import 'social';
@import 'layout-core-shared';

Expand Down
Loading