Skip to content

Commit

Permalink
Merge branch 'main' into main-his-a11y-role-img
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-deramond authored Oct 3, 2024
2 parents 0ee0a85 + 65b4109 commit 4cff215
Show file tree
Hide file tree
Showing 10 changed files with 321 additions and 248 deletions.
516 changes: 295 additions & 221 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"docs-serve": "hugo server --port 9001 --disableFastRender --noHTTPCache --renderToMemory --printPathWarnings --printUnusedTemplates",
"docs-serve-only": "sirv _site --no-clear --port 9001",
"lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json",
"update-deps": "ncu -u -x eslint,karma-browserstack-launcher,karma-rollup-preprocessor",
"update-deps": "ncu -u -x eslint,eslint-config-xo,karma-browserstack-launcher,karma-rollup-preprocessor,sass",
"release": "npm-run-all dist release-sri docs-build storybook-build release-zip*",
"release-sri": "node build/generate-sri.mjs",
"release-version": "node build/change-version.mjs",
Expand Down Expand Up @@ -111,9 +111,9 @@
"@percy/cli": "^1.29.4",
"@popperjs/core": "^2.11.8",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.7",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-replace": "^6.0.1",
"@stackblitz/sdk": "^1.11.0",
"@storybook/addon-a11y": "^8.3.4",
"@storybook/addon-essentials": "^8.3.4",
Expand All @@ -129,9 +129,9 @@
"clean-css-cli": "^5.6.3",
"clipboard": "^2.0.11",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-xo": "^0.45.0",
"eslint-plugin-html": "^8.1.1",
"eslint-plugin-html": "^8.1.2",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-storybook": "^0.9.0",
Expand All @@ -140,9 +140,9 @@
"focus-visible": "^5.2.1",
"globby": "^14.0.2",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.130.1",
"hugo-bin": "^0.132.0",
"ip": "^2.0.0",
"jasmine": "^5.2.0",
"jasmine": "^5.3.0",
"jquery": "^3.7.1",
"karma": "^6.4.4",
"karma-browserstack-launcher": "1.4.0",
Expand All @@ -154,26 +154,26 @@
"karma-jasmine-html-reporter": "^2.1.0",
"karma-rollup-preprocessor": "7.0.7",
"lockfile-lint": "^4.14.0",
"nodemon": "^3.1.4",
"npm-run-all2": "^6.2.2",
"nodemon": "^3.1.7",
"npm-run-all2": "^6.2.3",
"ods-storybook-theme": "^1.1.0",
"pa11y-ci": "^3.1.0",
"pa11y-ci-reporter-html": "^7.0.0",
"postcss": "^8.4.45",
"postcss": "^8.4.47",
"postcss-cli": "^11.0.0",
"rollup": "^4.21.2",
"rollup": "^4.23.0",
"rollup-plugin-istanbul": "^5.0.0",
"rtlcss": "^4.3.0",
"sass": "^1.77.8",
"sass": "1.78.0",
"sass-loader": "^16.0.2",
"sass-true": "^8.0.0",
"shelljs": "^0.8.5",
"sirv-cli": "^2.0.2",
"storybook": "^8.3.4",
"stylelint": "^16.8.1",
"stylelint-config-twbs-bootstrap": "^15.0.0",
"stylelint": "^16.9.0",
"stylelint-config-twbs-bootstrap": "^15.1.0",
"tarteaucitronjs": "^1.19.0",
"terser": "^5.31.6",
"terser": "^5.34.1",
"vnu-jar": "^23.4.11"
},
"files": [
Expand Down
3 changes: 1 addition & 2 deletions scss/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@
// The child selector allows nested `.card` within `.card-group`
// to display properly.
> .card {
// Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
flex: 1 0 0%;
flex: 1 0 0;
margin-bottom: 0;

+ .card {
Expand Down
2 changes: 1 addition & 1 deletion scss/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@
.nav-justified {
> .nav-link,
.nav-item {
flex-basis: 0;
flex-grow: 1;
flex-basis: 0;
text-align: center;
}
}
Expand Down
2 changes: 1 addition & 1 deletion scss/mixins/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
@include media-breakpoint-up($breakpoint, $breakpoints) {
// Provide basic `.col-{bp}` classes for equal-width flexbox columns
.col#{$infix} {
flex: 1 0 0%; // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
flex: 1 0 0;
}

.row-cols#{$infix}-auto > * {
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.3/about/license.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ Boosted is released under the MIT license and is copyright {{< year >}} Orange S
- Include the source of Boosted nor Bootstrap itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it
- Submit changes that you make to Boosted or Bootstrap back to their respective project (though such feedback is encouraged)

For more information, the full Boosted license is located [in the project repository]({{< param repo >}}/blob/v{{< param current_version >}}/LICENSE), and Bootstrap license is located [in the project repository](https://github.com/twbs/bootstrap/blob/v{{< param current_version >}}/LICENSE).
For more information, the [full Boosted license is located in the project repository]({{< param repo >}}/blob/v{{< param current_version >}}/LICENSE), and [Bootstrap license is located in the project repository](https://github.com/twbs/bootstrap/blob/v{{< param current_version >}}/LICENSE).
2 changes: 1 addition & 1 deletion site/content/docs/5.3/customize/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ You can find and customize these variables for key global options in Boosted's `
| `$enable-transitions` | `true` (default) or `false` | Enables predefined `transition`s on various components. |
| `$enable-reduced-motion` | `true` (default) or `false` | Enables the [`prefers-reduced-motion` media query]({{< docsref "/getting-started/accessibility#reduced-motion" >}}), which suppresses certain animations/transitions based on the users' browser/operating system preferences. |
| `$enable-grid-classes` | `true` (default) or `false` | Enables the generation of CSS classes for the grid system (e.g. `.row`, `.col-md-1`, etc.). |
| `$enable-css-grid` | `true` or `false` (default) | Enables the experimental CSS Grid system (e.g. `.grid`, `.g-col-md-1`, etc.). |
| `$enable-cssgrid` | `true` or `false` (default) | Enables the experimental CSS Grid system (e.g. `.grid`, `.g-col-md-1`, etc.). |
| `$enable-container-classes` | `true` (default) or `false` | Enables the generation of CSS classes for layout containers. (New in v5.2.0) |
| `$enable-caret` | `true` (default) or `false` | Enables pseudo element caret on `.dropdown-toggle`. |
| `$enable-button-pointers` | `true` (default) or `false` | Add "hand" cursor to non-disabled button elements. |
Expand Down
4 changes: 2 additions & 2 deletions site/layouts/_default/docs.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{ define "body_override" }}<body{{ if (eq .Page.Params.toc true) }} data-bs-spy="scroll" data-bs-target="#TableOfContents"{{ end }}>{{ end }}
{{ define "main" }}
<div class="container-xxl bd-gutter mt-3 my-md-4 bd-layout">
<aside class="bd-sidebar">
<nav class="bd-sidebar" aria-label="Docs navigation">
<div class="offcanvas-lg offcanvas-start" tabindex="-1" id="bdSidebar" aria-labelledby="bdSidebarOffcanvasLabel">
<div class="offcanvas-header border-bottom">
<h5 class="offcanvas-title" id="bdSidebarOffcanvasLabel">Browse docs</h5>
Expand All @@ -12,7 +12,7 @@ <h5 class="offcanvas-title" id="bdSidebarOffcanvasLabel">Browse docs</h5>
{{ partial "docs-sidebar" . }}
</div>
</div>
</aside>
</nav>

<main class="bd-main order-1">
<div class="bd-intro pt-2 ps-lg-2">
Expand Down
2 changes: 1 addition & 1 deletion site/layouts/_default/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1 class="display-1">{{ .Title | markdownify }}</h1>
</div>
{{ else if eq .Title "Orange Design System for web" -}}
<div class="d-flex flex-column flex-sm-row">
<a href="{{ .Site.Params.ods.web }}" class="btn btn-primary" aria-label="Design system for web" title="Design system for web" target="_blank" rel="noopener">Visit system.design.orange.com</a>
<a href="{{ .Site.Params.ods.web }}" class="btn btn-primary" aria-label="Visit Orange Design System for web at system.design.orange.com" title="Visit Orange Design System for web at system.design.orange.com" target="_blank" rel="noopener">Visit system.design.orange.com</a>
</div>
{{- end }}
</div>
Expand Down
4 changes: 2 additions & 2 deletions site/layouts/partials/docs-sidebar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<nav class="bd-links w-100" id="bd-docs-nav" aria-label="Docs navigation">
<div class="bd-links w-100" id="bd-docs-nav">
{{- $url := split .Permalink "/" -}}
{{- $page_slug := index $url (sub (len $url) 2) -}}

Expand Down Expand Up @@ -44,4 +44,4 @@
{{- end }}
{{- end }}
</ul>
</nav>
</div>

0 comments on commit 4cff215

Please sign in to comment.