tmp

Orange-OpenSource · Nov 8, 2024 · b2395b9 · b2395b9
1 parent 6759b74
commit b2395b9
Show file tree

Hide file tree

Showing 47 changed files with 9,610 additions and 7,477 deletions.
diff --git 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": "61.5 kB"
     },
     {
       "path": "./dist/css/ouds-web-bootstrap.min.css",
-      "maxSize": "58.0 kB"
+      "maxSize": "58.75 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.5 kB"
     },
     {
       "path": "./dist/css/ouds-web-reboot.min.css",
-      "maxSize": "4.5 kB"
+      "maxSize": "5.25 kB"
     },
     {
       "path": "./dist/css/ouds-web-utilities.css",
-      "maxSize": "20.75 kB"
+      "maxSize": "21.5 kB"
     },
     {
       "path": "./dist/css/ouds-web-utilities.min.css",
-      "maxSize": "19.75 kB"
+      "maxSize": "20.5 kB"
     },
     {
       "path": "./dist/css/ouds-web.css",
-      "maxSize": "54.75 kB"
+      "maxSize": "55.5 kB"
     },
     {
       "path": "./dist/css/ouds-web.min.css",
-      "maxSize": "51.5 kB"
+      "maxSize": "52.25 kB"
     },
     {
       "path": "./dist/js/ouds-web.bundle.js",

diff --git 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",

diff --git a/scss/_config.scss b/scss/_config.scss
@@ -0,0 +1,3 @@
+// Configuration file for OUDS Web
+
+$prefix: bs- !default;
diff --git a/scss/_maps.scss b/scss/_maps.scss
@@ -83,6 +83,37 @@ $ouds-elevations: (
 ) !default;
 // scss-docs-end ouds-maps-elevations
 
+// scss-docs-start ouds-maps-fonts
+$ouds-font-sizes: (
+  dl: "%display-large",
+  dm: "%display-medium",
+  ds: "%display-small",
+  hxl: "%heading-xlarge",
+  hl: "%heading-large",
+  hm: "%heading-medium",
+  hs: "%heading-small",
+  bl: "%body-large",
+  bm: "%body-medium",
+  bs: "%body-small",
+  lxl: "%label-xlarge",
+  ll: "%label-large",
+  lm: "%label-medium",
+  ls: "%label-small",
+  cm: "%code-medium",
+  cs: "%code-small"
+) !default;
+
+$ouds-font-weights: (
+  normal: $ouds-font-weight-web-default,
+  bold: $ouds-font-weight-web-strong
+) !default;
+
+$ouds-line-lengths: (
+  sm: 40ch,
+  md: 80ch
+) !default;
+// scss-docs-end ouds-maps-fonts
+
 // scss-docs-start ouds-maps-opacities
 $ouds-opacities: (
   "transparent": $ouds-opacity-transparent,

diff --git 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 maybe 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
@@ -134,43 +134,46 @@ hr {
 %heading {
   margin-top: 0; // 1
   margin-bottom: $headings-margin-bottom;
-  @include font-size($font-size-base);  // OUDS mod
   font-family: $headings-font-family;
   font-style: $headings-font-style;
   font-weight: $headings-font-weight;
   line-height: $headings-line-height;
   color: var(--#{$prefix}heading-color);
 
   /* rtl:remove */
-  letter-spacing: $letter-spacing-base; // OUDS mod
   -webkit-font-smoothing: antialiased;  // OUDS mod
   -moz-osx-font-smoothing: grayscale;   // OUDS mod
   text-rendering: optimizelegibility;   // OUDS mod
 }
 
 h1 {
   @extend %heading;
-  @include font-size($h4-font-size);
-  line-height: $h4-line-height;
+  @extend %heading-xlarge; // OUDS mod: instead of `@include font-size($h1-font-size)`
+}
 
-  /* rtl:remove */
-  letter-spacing: $h4-spacing;
+h2 {
+  @extend %heading;
+  @extend %heading-large; // OUDS mod: instead of `@include font-size($h2-font-size)`
 }
 
-h2,
 h3 {
   @extend %heading;
-  @include font-size($h5-font-size);
-  line-height: $h5-line-height;
+  @extend %heading-medium; // OUDS mod: instead of `@include font-size($h3-font-size)`
+}
 
-  /* rtl:remove */
-  letter-spacing: $h5-spacing;
+h4 {
+  @extend %heading;
+  @extend %heading-small; // OUDS mod: instead of `@include font-size($h4-font-size)`
+}
+
+h5 {
+  @extend %heading;
+  @extend %body-large; // OUDS mod: instead of `@include font-size($h5-font-size)`
 }
 
-h4,
-h5,
 h6 {
   @extend %heading;
+  @extend %body-medium; // OUDS mod: instead of `@include font-size($h6-font-size)`
 }
 
 
@@ -286,6 +289,13 @@ blockquote {
   margin: 0 0 1rem;
 }
 
+// OUDS mod: No italic
+em,
+cite {
+  font-style: normal; // OUDS mod: remove italic.
+}
+// End mod
+
 
 // Strong
 //
@@ -304,10 +314,6 @@ strong {
 
 small {
   @include font-size($small-font-size);
-  // OUDS mod
-  font-weight: $font-weight-normal;
-  line-height: $line-height-sm;
-  // End mod
 }
 
 
@@ -383,8 +389,7 @@ pre {
   margin-top: 0; // 1
   margin-bottom: 1rem; // 2
   overflow: auto; // 3
-  @include font-size($code-font-size);
-  line-height: $pre-line-height; // OUDS mod
+  @extend %code-small; // OUDS mod: instead of `@include font-size($code-font-size)`
   color: $pre-color;
 
   // Account for some code outputs that place code tags in pre tags
@@ -399,7 +404,6 @@ var, // OUDS mod
 code {
   @include font-size($code-font-size);
   font-style: normal; // OUDS mod: <var> is italic in all browsers
-  line-height: $line-height-sm; // OUDS mod
   color: var(--#{$prefix}code-color);
   word-wrap: break-word;
 
@@ -460,13 +464,10 @@ table {
 caption {
   padding-top: $table-caption-padding-y;
   padding-bottom: $table-caption-padding-y;
-  @include font-size($h1-font-size);    // OUDS mod
-  font-weight: $font-weight-bold;       // OUDS mod
+  @extend %heading-xlarge; // OUDS mod
+  font-weight: $font-weight-bold; // OUDS mod
   color: $table-caption-color;
   text-align: left;
-
-  /* rtl:remove */
-  letter-spacing: $h1-spacing;          // OUDS mod
   -webkit-font-smoothing: antialiased;  // OUDS mod
   -moz-osx-font-smoothing: grayscale;   // OUDS mod
   text-rendering: optimizelegibility;   // OUDS mod
@@ -500,7 +501,6 @@ th {
 
 label {
   display: inline-block; // 1
-  font-weight: $form-label-font-weight; // OUDS mod
 }
 
 // Remove the default `border-radius` that macOS Chrome adds.
@@ -626,9 +626,8 @@ legend {
   width: 100%;
   padding: 0;
   margin-bottom: $legend-margin-bottom;
-  @include font-size($legend-font-size);
+  @extend %body-large; // OUDS mod: instead of `@include font-size($legend-font-size)`
   font-weight: $legend-font-weight;
-  line-height: inherit;
 
   + * {
     clear: left; // 2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		// Configuration file for OUDS Web

		$prefix: bs- !default;