Skip to content

Commit

Permalink
chore(merge main) patched commit → 9c01633 (#921)
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-deramond authored Nov 23, 2021
1 parent 541d838 commit df23a3d
Show file tree
Hide file tree
Showing 13 changed files with 192 additions and 156 deletions.
154 changes: 62 additions & 92 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"delay-cli": "^1.1.0",
"eslint": "^8.2.0",
"eslint-config-xo": "^0.39.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-unicorn": "^38.0.1",
"find-unused-sass-variables": "^3.1.0",
"focus-visible": "^5.2.0",
Expand All @@ -138,23 +138,23 @@
"karma-jasmine": "^4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"karma-rollup-preprocessor": "^7.0.7",
"linkinator": "^2.14.5",
"linkinator": "^2.16.2",
"lockfile-lint": "^4.6.2",
"nodemon": "^2.0.14",
"nodemon": "^2.0.15",
"npm-run-all": "^4.1.5",
"pa11y-ci": "^2.4.2",
"pa11y-ci-reporter-html": "^3.0.2",
"postcss": "^8.3.11",
"postcss-cli": "^9.0.2",
"rollup": "^2.59.0",
"rollup": "^2.60.0",
"rollup-plugin-istanbul": "^3.0.0",
"rtlcss": "^3.5.0",
"sass": "^1.43.4",
"shelljs": "^0.8.4",
"stylelint": "^13.13.1",
"stylelint-config-twbs-bootstrap": "^2.2.4",
"tarteaucitronjs": "^1.9.5",
"terser": "^5.9.0",
"terser": "^5.10.0",
"vnu-jar": "21.10.12"
},
"files": [
Expand Down
57 changes: 57 additions & 0 deletions scss/_maps.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Re-assigned maps
//
// Placed here so that others can override the default Sass maps and see automatic updates to utilities and more.

// scss-docs-start theme-colors-rgb
$theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value") !default;
// scss-docs-end theme-colors-rgb

// Boosted mod
$background-colors: map-merge(
$theme-colors,
(
"success": $supporting-green,
"info": $supporting-blue,
"warning": $supporting-yellow,
"danger": $danger
)
) !default;
// End mod

// Utilities maps
//
// Extends the default `$theme-colors` maps to help create our utilities.

// Come v6, we'll de-dupe these variables. Until then, for backward compatibility, we keep them to reassign.
// scss-docs-start utilities-colors
$utilities-colors: $theme-colors-rgb !default;
// scss-docs-end utilities-colors

// scss-docs-start utilities-text-colors
// Boosted mod: content of $utilities-text
$utilities-text: (
"primary": to-rgb($accessible-orange),
"light": to-rgb($gray-500),
"white": to-rgb($white),
"body": to-rgb($body-color),
) !default;
$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default;
// scss-docs-end utilities-text-colors

// scss-docs-start utilities-bg-colors
$utilities-bg: map-merge(
$utilities-colors,
(
"black": to-rgb($black),
"white": to-rgb($white),
"body": to-rgb($body-bg)
)
) !default;
$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default;
// scss-docs-end utilities-bg-colors

$negative-spacers: if($enable-negative-margins, negativify-map($spacers), null) !default;

$gutters: $spacers !default;

$alert-colors: map-remove($theme-colors, "primary", "secondary", "light", "dark") !default; // Boosted mod
Loading

0 comments on commit df23a3d

Please sign in to comment.