Skip to content

Commit

Permalink
#1406 - updated sass-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
Jura committed Nov 19, 2024
1 parent 7b29292 commit a2f65e7
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion docs/css/base-minimal.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/css/ckeditor5.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/css/components/page-hero.min.css

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"resolve-url-loader": "^5.0.0",
"sass": "^1.62.1",
"sass-embedded": "^1.81.0",
"sass-loader": "^13.3.2",
"sass-loader": "^16.0.3",
"storybook": "^8.3.6",
"style-loader": "^3.3.2",
"stylelint": "^16.9.0",
Expand Down
4 changes: 1 addition & 3 deletions stories/assets/scss/_grid-settings.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@import 'node_modules/foundation-sites/scss/util/util';

// 1. Global
// ---------

$global-width: rem-calc(1440);
$global-width: 90rem;

// 2. Breakpoints
// --------------
Expand Down
12 changes: 6 additions & 6 deletions stories/assets/scss/_grid.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'grid-settings';
@import 'node_modules/foundation-sites/scss/foundation';
@use 'grid-settings';
@use '../../../node_modules/foundation-sites/scss/foundation';

@include foundation-xy-grid-classes(
@include foundation.foundation-xy-grid-classes(
$base-grid: true,
$margin-grid: true,
$padding-grid: true,
Expand All @@ -12,6 +12,6 @@
$frame-grid: true
);

@include foundation-float-classes;
@include foundation-flex-classes;
@include foundation-visibility-classes;
@include foundation.foundation-float-classes;
@include foundation.foundation-flex-classes;
@include foundation.foundation-visibility-classes;

0 comments on commit a2f65e7

Please sign in to comment.