diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 1505b2be6f..1345328a00 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -2,11 +2,11 @@ "files": [ { "path": "./dist/css/ouds-web-bootstrap.css", - "maxSize": "61.0 kB" + "maxSize": "62.75 kB" }, { "path": "./dist/css/ouds-web-bootstrap.min.css", - "maxSize": "58.0 kB" + "maxSize": "59.5 kB" }, { "path": "./dist/css/ouds-web-grid.css", @@ -18,27 +18,27 @@ }, { "path": "./dist/css/ouds-web-reboot.css", - "maxSize": "4.75 kB" + "maxSize": "5.75 kB" }, { "path": "./dist/css/ouds-web-reboot.min.css", - "maxSize": "4.5 kB" + "maxSize": "5.5 kB" }, { "path": "./dist/css/ouds-web-utilities.css", - "maxSize": "20.75 kB" + "maxSize": "22.25 kB" }, { "path": "./dist/css/ouds-web-utilities.min.css", - "maxSize": "19.75 kB" + "maxSize": "21.0 kB" }, { "path": "./dist/css/ouds-web.css", - "maxSize": "54.75 kB" + "maxSize": "56.25 kB" }, { "path": "./dist/css/ouds-web.min.css", - "maxSize": "51.5 kB" + "maxSize": "53.0 kB" }, { "path": "./dist/js/ouds-web.bundle.js", diff --git a/.cspell.json b/.cspell.json index 1ed62dcfa0..bd3ad80132 100644 --- a/.cspell.json +++ b/.cspell.json @@ -25,6 +25,7 @@ "clic", "Codesniffer", "combinator", + "Consolas", "Contentful", "Cpath", "Crossfade", @@ -70,6 +71,7 @@ "Lowercased", "markdownify", "mediaqueries", + "Menlo", "minifiers", "misfunction", "mkdir", @@ -155,6 +157,7 @@ "WCAG", "whatsapp", "WICG's", + "xlarge", "zindex", "بالعالم", "مرحبًا" diff --git a/NOTICE.txt b/NOTICE.txt index bfff01336d..cee9a46819 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -12,6 +12,7 @@ nuget/ouds-web.png site/layouts/partials/icons.html site/static/docs/**/assets/brand/orange-logo.svg site/static/docs/**/assets/brand/orange-social.png +site/static/docs/**/assets/fonts/solaris-icons.woff2 site/static/docs/**/assets/img/favicons/android-chrome-192x192.png site/static/docs/**/assets/img/favicons/android-chrome-512x512.png site/static/docs/**/assets/img/favicons/apple-touch-icon.png diff --git a/scss/_helpers.scss b/scss/_helpers.scss index 13f2752c9b..a246e3b508 100644 --- a/scss/_helpers.scss +++ b/scss/_helpers.scss @@ -2,6 +2,7 @@ @import "helpers/color-bg"; @import "helpers/colored-links"; @import "helpers/focus-ring"; +@import "helpers/icon"; @import "helpers/icon-link"; @import "helpers/ratio"; @import "helpers/position"; diff --git a/scss/_maps.scss b/scss/_maps.scss index 31e2fc3935..0a45c22aa3 100644 --- a/scss/_maps.scss +++ b/scss/_maps.scss @@ -83,6 +83,30 @@ $ouds-elevations: ( ) !default; // scss-docs-end ouds-maps-elevations +// scss-docs-start ouds-maps-font +$ouds-font-sizes: ( + cs: "/code-small", + cm: "/code-medium", + bs: "/body-small", + bm: "/body-medium", + bl: "/body-large", + hs: "/heading-small", + hm: "/heading-medium", + hl: "/heading-large", + hxl: "/heading-xlarge", + ds: "/display-small", + dm: "/display-medium", + dl: "/display-large", +) !default; + +$ouds-font-weights: ( + normal: $ouds-font-weight-default, + bold: $ouds-font-weight-strong +) !default; + +$ouds-icon-sizes: ("short", "medium", "tall") !default; +// scss-docs-end ouds-maps-font + // scss-docs-start ouds-maps-opacities $ouds-opacities: ( "transparent": $ouds-opacity-transparent, diff --git a/scss/_mixins.scss b/scss/_mixins.scss index d46000cfae..db10fb3637 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -12,6 +12,7 @@ @import "mixins/breakpoints"; @import "mixins/color-mode"; @import "mixins/color-scheme"; +@import "mixins/fonts"; // OUDS mod @import "mixins/image"; @import "mixins/resize"; @import "mixins/visually-hidden"; diff --git a/scss/_reboot.scss b/scss/_reboot.scss index b1fdf59e4e..18ec72ba69 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -57,7 +57,7 @@ // 2. As a best practice, apply a default `background-color`. // 3. Prevent adjustments of font size after orientation changes in iOS. // 4. Change the default tap highlight to be completely transparent in iOS. -// 5. Prevent faux-bold/italic +// 5. Prevent faux-bold/italic especially for some RTL fonts // See https://developer.mozilla.org/fr/docs/Web/CSS/font-synthesis // scss-docs-start reboot-body-rules @@ -69,11 +69,11 @@ body { @include font-size(var(--#{$prefix}body-font-size)); font-weight: var(--#{$prefix}body-font-weight); line-height: var(--#{$prefix}body-line-height); - // OUDS mod: no color + color: var(--#{$prefix}body-color); text-align: var(--#{$prefix}body-text-align); /* rtl:remove */ - letter-spacing: $letter-spacing-base; // OUDS mod + letter-spacing: var(--#{$prefix}body-letter-spacing); // OUDS mod background-color: var(--#{$prefix}body-bg); // 2 -webkit-text-size-adjust: 100%; // 3 -webkit-tap-highlight-color: rgba($black, 0); // 4 @@ -131,10 +131,10 @@ hr { // By default, `
Table heading | +Table heading | +Table heading | +Table heading | +
---|---|---|---|
Table cell | +Table cell | +Table cell | +Table cell | +
Table cell | +Table cell | +Table cell | +Table cell | +
Table cell | +Table cell | +Table cell | +Table cell | +