Skip to content

Chore merge from c735b2e to 9dd42e1 #1873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8071f53
c735b2e196544b3bba25d645f4d725e8667b106c
julien-deramond Mar 6, 2023
206a6c2
639306242f4bb402eeaebcb819846909cceda774
julien-deramond Mar 6, 2023
0b5a9a8
3ce4fedaa2e180f64093b48e7f9de04c5754ad98
julien-deramond Mar 7, 2023
a693b51
99e37244592b67d873ac563b2f172073fdd50287
julien-deramond Mar 7, 2023
4dc4447
af600652667ef5d44137eba6d80f3e60c2d8503d
julien-deramond Mar 7, 2023
acfd040
2975911a869cda8dc60e415bb04a1b8beffc011d
julien-deramond Mar 7, 2023
5ba59ad
52656db328c7141b0ab26a5871510e0d360b741f
julien-deramond Mar 7, 2023
af661cd
9f5dca077751ff4abc2361d13766a4ed18ee04fc
julien-deramond Mar 7, 2023
fd5d25e
7432ebc665042a7381a0682879996b049abb1ff6
julien-deramond Mar 7, 2023
fd39c1d
f5f6c5c4e3599458e4097f56318bf7b3f3bd9681
julien-deramond Mar 7, 2023
3de8ada
80a526621f5baf6d048ea8dd2964eaac16f405b8
julien-deramond Mar 7, 2023
56d8cab
70bad9b1b6a39a405b77a2d062b5e313a8219d6d
julien-deramond Mar 7, 2023
c511d80
7bffd6ea8d073f1c8fa2209ef2864227f7c5f213
julien-deramond Mar 7, 2023
785ac76
02bb371f42e292196decfb57b78cf4504ee8377c
julien-deramond Mar 7, 2023
af293d8
83797243142ae162b264e3406072b63b189eef3e
julien-deramond Mar 7, 2023
2d1705b
2f75915f699d2c05564692e83d0727f98c373ea7
julien-deramond Mar 7, 2023
a6392a5
3e3938f036c9feabf7a64548f94cb99dde44b18c
julien-deramond Mar 7, 2023
b9dbd74
68afebe5b5361deb1a220cd2f3f2e12e5c6ffc5e
julien-deramond Mar 7, 2023
6bdf6d8
30e8d139fe0ba5d13692cd6e43ff734489ac4298
julien-deramond Mar 7, 2023
659a54a
d0fece932072872eb0e6aa688849f80465cfe6b6
julien-deramond Mar 7, 2023
ef40a20
9dd42e1a07cba04d52050f47d9a343416d72b8c0
julien-deramond Mar 7, 2023
bb99853
Update site/layouts/_default/docs.html
julien-deramond Mar 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Have a bug or a feature request? Please first read the [issue guidelines](https:

Boosted's documentation, included in this repo in the root directory, is built with [Hugo](https://gohugo.io/) and publicly hosted on GitHub Pages at <https://boosted.orange.com/>. The docs may also be run locally.

Documentation search is powered by [Algolia's DocSearch](https://docsearch.algolia.com/). Working on our search? Be sure to set `debug: true` in `site/assets/js/search.js` file.
Documentation search is powered by [Algolia's DocSearch](https://docsearch.algolia.com/).

### Running documentation locally

Expand Down
1 change: 1 addition & 0 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ params:
js_bundle_hash: "sha384-EI6cnT2fBMBrnTJ/qDfugxlUP4IZpgvfH8vXsron3CcD2GWbP1KoEoG2XiXPe9Qs"
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
popper_hash: "sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3"
popper_esm: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/esm/popper.min.js"
focus_visible: "https://cdn.jsdelivr.net/npm/[email protected]/dist/focus-visible.min.js"
focus_visible_hash: "sha384-xRa5B8rCDfdg0npZcxAh+RXswrbFk3g6dlHVeABeluN8EIwdyljz/LqJgc2R3KNA"

Expand Down
1 change: 0 additions & 1 deletion js/src/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ class Modal extends BaseComponent {
}

if (this._config.keyboard) {
event.preventDefault()
this.hide()
return
}
Expand Down
6 changes: 3 additions & 3 deletions js/src/offcanvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ class Offcanvas extends BaseComponent {
return
}

if (!this._config.keyboard) {
EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED)
if (this._config.keyboard) {
this.hide()
return
}

this.hide()
EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED)
})
}

Expand Down
102 changes: 51 additions & 51 deletions js/tests/unit/tooltip.spec.js

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions package-lock.json

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

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@
"js-test-cloud": "cross-env BROWSERSTACK=true npm run js-test-karma",
"js-test-jquery": "cross-env JQUERY=true npm run js-test-karma",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel js-lint css-lint lockfile-lint",
"docs": "npm-run-all docs-build docs-lint",
"docs": "npm-run-all docs-build docs-lint docs-check-unused-templates",
"docs-build": "hugo --cleanDestinationDir",
"docs-check-unused-templates": "hugo --printUnusedTemplates",
"docs-compile": "npm run docs-build",
"docs-vnu": "node build/vnu-jar.js",
"docs-lint": "npm run docs-vnu",
Expand Down Expand Up @@ -129,7 +130,7 @@
"bundlewatch": "^0.3.3",
"clean-css-cli": "^5.6.2",
"cross-env": "^7.0.3",
"eslint": "^8.32.0",
"eslint": "^8.34.0",
"eslint-config-xo": "^0.43.1",
"eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "^2.27.5",
Expand All @@ -153,18 +154,18 @@
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"karma-rollup-preprocessor": "7.0.7",
"lockfile-lint": "^4.10.0",
"lockfile-lint": "^4.10.1",
"nodemon": "^2.0.20",
"npm-run-all": "^4.1.5",
"ods-storybook-theme": "^0.1.0",
"pa11y-ci": "^3.0.1",
"pa11y-ci-reporter-html": "^5.0.4",
"postcss": "^8.4.21",
"postcss-cli": "^10.1.0",
"rollup": "^3.10.1",
"rollup": "^3.15.0",
"rollup-plugin-istanbul": "^4.0.0",
"rtlcss": "^4.0.0",
"sass": "^1.57.1",
"sass": "^1.58.1",
"sass-loader": "^10.1.1",
"sass-true": "^7.0.0",
"shelljs": "^0.8.5",
Expand Down
2 changes: 1 addition & 1 deletion scss/_alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

@each $state, $value in $alert-colors {
.alert-#{$state} {
--#{$prefix}alert-color: var(--#{$prefix}#{$state}-text);
--#{$prefix}alert-color: var(--#{$prefix}#{$state}-text-emphasis);
--#{$prefix}alert-border-color: var(--#{$prefix}#{$state}-border-subtle);
// Boosted mod: no `--#{$prefix}alert-link-color`
--#{$prefix}alert-icon-bg-image: #{map-get($alert-icons, $state)}; // Boosted mod
Expand Down
5 changes: 3 additions & 2 deletions scss/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@ $utilities: map-merge(
values: $utilities-border-subtle
),
"border-width": (
css-var: true,
css-variable-name: border-width,
property: border-width,
// css-var: true,
// css-variable-name: border-width,
class: border,
values: $border-widths
),
Expand Down
2 changes: 1 addition & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1511,7 +1511,7 @@ $dropdown-link-hover-bg: $gray-500 !default; // Boosted mod: instead
$dropdown-link-active-color: color-contrast($component-active-color) !default; // Boosted mod
$dropdown-link-active-bg: $component-active-color !default; // Boosted mod

$dropdown-link-disabled-color: $gray-500 !default;
$dropdown-link-disabled-color: $gray-500 !default; // Boosted mod: instead of `var(--#{$prefix}tertiary-color)`

$dropdown-item-padding-y: $spacer * .5 !default;
$dropdown-item-padding-x: $spacer * .5 !default;
Expand Down
10 changes: 5 additions & 5 deletions scss/tests/utilities/_api.test.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ $utilities: ();

$grid-breakpoints: (
xs: 0,
sm: 576px,
md: 768px
);
sm: 333px,
md: 666px
) !global;


@include assert() {
Expand All @@ -52,13 +52,13 @@ $utilities: ();
font-size: 1.25rem !important;
}

@media (min-width: 480px) { // Boosted mod: instead of 576px
@media (min-width: 333px) {
.padding-sm-1rem {
padding: 1rem !important;
}
}

@media (min-width: 768px) {
@media (min-width: 666px) {
.padding-md-1rem {
padding: 1rem !important;
}
Expand Down
4 changes: 1 addition & 3 deletions site/assets/js/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@

return item
})
},
// Set debug to `true` if you want to inspect the dropdown
debug: false
}
})
})()
5 changes: 5 additions & 0 deletions site/assets/scss/_scrolling.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// When navigating with the keyboard, prevent focus from landing behind the sticky header

main *:focus {
scroll-margin-top: 100px;
}
4 changes: 2 additions & 2 deletions site/assets/scss/_toc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

a {
display: block;
padding: .125rem 0 .125rem .625rem;
padding: .125rem 0 .125rem .75rem;
color: inherit;
text-decoration: none;
border-left: .125rem solid transparent;
Expand Down Expand Up @@ -64,7 +64,7 @@
.bd-toc-collapse {
@include media-breakpoint-down(md) {
nav {
padding: 1.25rem;
padding: 1.25rem 1.25rem 1.25rem 1rem;
background-color: var(--bs-tertiary-bg);
border: 1px solid var(--bs-border-color);
@include border-radius(var(--bs-border-radius));
Expand Down
1 change: 1 addition & 0 deletions site/assets/scss/docs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ $enable-cssgrid: true; // stylelint-disable-line scss/dollar-variable-default
@import "colors";
@import "clipboard-js";
@import "placeholder-img";
@import "scrolling";

// Load docs dependencies
@import "syntax";
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.3/components/navs-tabs.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ Take that same HTML, but use `.nav-underline` instead:
<a class="nav-link" href="#">Link</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
<a class="nav-link disabled">Disabled</a>
</li>
</ul>
{{< /example >}}
Expand Down
Loading