diff --git a/site/data/core-team.yml b/site/data/core-team.yml
index 8439e8f339..e53508bb84 100644
--- a/site/data/core-team.yml
+++ b/site/data/core-team.yml
@@ -1,18 +1,9 @@
-- name: Gaël Poupard
- user: ffoodd
-
-- name: Sylvain Pigeard
- user: PigeardSylvain
-
- name: Loïc Laussel
user: Lausselloic
- name: Julien Déramond
user: julien-deramond
-- name: Isabelle Chanclou
- user: isabellechanclou
-
- name: Louis-Maxime Piton
user: louismaximepiton
From 6223e10c0c081ea85b585b38075cd8da89cf84cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20D=C3=A9ramond?=
Date: Wed, 13 Sep 2023 15:37:15 +0200
Subject: [PATCH 6/8] =?UTF-8?q?chore(merge=20main):=20patched=20commit=20?=
=?UTF-8?q?=E2=86=92=208816177=20(#2238)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Louis-Maxime Piton
---
.github/SUPPORT.md | 15 +-
.github/workflows/browserstack.yml | 2 +-
.github/workflows/bundlewatch.yml | 2 +-
.../workflows/calibreapp-image-actions.yml | 2 +-
.github/workflows/cspell.yml | 2 +-
.github/workflows/css.yml | 2 +-
.github/workflows/docs.yml | 2 +-
.github/workflows/js.yml | 2 +-
.github/workflows/lint.yml | 2 +-
.github/workflows/node-sass.yml | 2 +-
.github/workflows/pa11y.yml | 2 +-
.github/workflows/percy.yml | 2 +-
js/src/dom/selector-engine.js | 4 +-
js/tests/unit/dom/selector-engine.spec.js | 12 +
package-lock.json | 718 +++++++++---------
package.json | 18 +-
scss/_reboot.scss | 2 +-
scss/_root.scss | 4 +-
scss/_variables-dark.scss | 2 +
scss/_variables.scss | 23 +-
scss/forms/_form-check.scss | 1 +
scss/mixins/_grid.scss | 2 +-
.../docs/5.3/getting-started/download.md | 8 +
.../docs/5.3/getting-started/introduction.md | 9 +
site/content/docs/5.3/migration.md | 2 +
25 files changed, 444 insertions(+), 398 deletions(-)
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index 26b3be42c5..0f6e11e65b 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -4,8 +4,17 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.
### How-to
-For general troubleshooting or help getting started:
+For general Boosted troubleshooting or help getting started:
-- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
+- Ask questions and explore [our GitHub Discussions](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/discussions).
+- Chat with the core team and fellow Boosted users on internal Orange communication tools.
+
+For general Bootstrap troubleshooting or help getting started:
+
+- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
+- Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/).
+- Ask questions and explore [Bootstrap GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
+- Discuss, ask questions, and more on [the community Discord](https://discord.gg/bZUvakRU3M) or [Bootstrap subreddit](https://reddit.com/r/bootstrap).
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
-- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.
+- Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)).
+- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index 9168c80e29..97f0e466aa 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -19,7 +19,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/bundlewatch.yml
index 23bb78b866..d1346ff414 100644
--- a/.github/workflows/bundlewatch.yml
+++ b/.github/workflows/bundlewatch.yml
@@ -24,7 +24,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/calibreapp-image-actions.yml b/.github/workflows/calibreapp-image-actions.yml
index 8447b9eae2..30bef2a28c 100644
--- a/.github/workflows/calibreapp-image-actions.yml
+++ b/.github/workflows/calibreapp-image-actions.yml
@@ -23,7 +23,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout Repo
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/cspell.yml b/.github/workflows/cspell.yml
index 8c48f01e50..bb9986bdee 100644
--- a/.github/workflows/cspell.yml
+++ b/.github/workflows/cspell.yml
@@ -25,7 +25,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/css.yml b/.github/workflows/css.yml
index 4a7754c55a..53d613bf4d 100644
--- a/.github/workflows/css.yml
+++ b/.github/workflows/css.yml
@@ -23,7 +23,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 1198569008..d86570f583 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -25,7 +25,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 32be322167..9a73fb3e1c 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -28,7 +28,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 73a415384d..227dae78b5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -24,7 +24,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/node-sass.yml b/.github/workflows/node-sass.yml
index df252aca33..d63f48b1ad 100644
--- a/.github/workflows/node-sass.yml
+++ b/.github/workflows/node-sass.yml
@@ -23,7 +23,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/pa11y.yml b/.github/workflows/pa11y.yml
index 3826bf1a7f..e2070d30e8 100644
--- a/.github/workflows/pa11y.yml
+++ b/.github/workflows/pa11y.yml
@@ -22,7 +22,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/.github/workflows/percy.yml b/.github/workflows/percy.yml
index 2bcad3513d..e3248f4c48 100644
--- a/.github/workflows/percy.yml
+++ b/.github/workflows/percy.yml
@@ -20,7 +20,7 @@ jobs:
steps:
- name: Clone repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
diff --git a/js/src/dom/selector-engine.js b/js/src/dom/selector-engine.js
index 3cecf6f40c..a47f72001b 100644
--- a/js/src/dom/selector-engine.js
+++ b/js/src/dom/selector-engine.js
@@ -26,10 +26,10 @@ const getSelector = element => {
hrefAttribute = `#${hrefAttribute.split('#')[1]}`
}
- selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null
+ selector = hrefAttribute && hrefAttribute !== '#' ? parseSelector(hrefAttribute.trim()) : null
}
- return parseSelector(selector)
+ return selector
}
const SelectorEngine = {
diff --git a/js/tests/unit/dom/selector-engine.spec.js b/js/tests/unit/dom/selector-engine.spec.js
index 8dd7b1f893..72c0bf6db8 100644
--- a/js/tests/unit/dom/selector-engine.spec.js
+++ b/js/tests/unit/dom/selector-engine.spec.js
@@ -359,6 +359,18 @@ describe('SelectorEngine', () => {
expect(SelectorEngine.getMultipleElementsFromSelector(testEl)).toEqual(Array.from(fixtureEl.querySelectorAll('.target')))
})
+ it('should get elements if several ids are given', () => {
+ fixtureEl.innerHTML = [
+ '
',
+ '
',
+ '
'
+ ].join('')
+
+ const testEl = fixtureEl.querySelector('#test')
+
+ expect(SelectorEngine.getMultipleElementsFromSelector(testEl)).toEqual(Array.from(fixtureEl.querySelectorAll('.target')))
+ })
+
it('should get elements in array, from href if no data-bs-target set', () => {
fixtureEl.innerHTML = [
'$local-nav-hover-bg$local-nav-hover-color$local-nav-padding-y$mark-bg-dark$mark-color-dark
Date: Thu, 14 Sep 2023 14:36:05 +0200
Subject: [PATCH 7/8] Add Solaris icons for light/dark mode (#2237)
---
site/assets/scss/_navbar.scss | 16 ++++++++++++++
site/layouts/_default/examples.html | 30 ++++++++++++++++++--------
site/layouts/partials/docs-navbar.html | 4 ++--
site/layouts/partials/icons.html | 15 ++++++-------
4 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/site/assets/scss/_navbar.scss b/site/assets/scss/_navbar.scss
index 8decf4e8f8..5792538cf1 100644
--- a/site/assets/scss/_navbar.scss
+++ b/site/assets/scss/_navbar.scss
@@ -1,4 +1,6 @@
.bd-navbar {
+ --bd-navbar-dropdown-item-icon-size: 1.25rem; // Boosted mod
+
// Boosted mod: no padding
// Boosted mod: no background-color
// Boosted mod: no box-shadow
@@ -20,6 +22,11 @@
&.active {
color: var(--bs-link-hover-color);
}
+
+ .bi {
+ width: var(--bd-navbar-dropdown-item-icon-size);
+ height: var(--bd-navbar-dropdown-item-icon-size);
+ }
}
// End mod
@@ -36,6 +43,15 @@
--bs-dropdown-line-height: #{$line-height-sm};
--bs-dropdown-item-padding-y: #{$dropdown-item-padding-y + .0625rem};
+ .dropdown-item {
+ height: 2.5rem;
+ }
+
+ .bi {
+ width: var(--bd-navbar-dropdown-item-icon-size);
+ height: var(--bd-navbar-dropdown-item-icon-size);
+ }
+
.active .bi {
display: block !important; // stylelint-disable-line declaration-no-important
}
diff --git a/site/layouts/_default/examples.html b/site/layouts/_default/examples.html
index de61a041c7..82b2a96ddc 100644
--- a/site/layouts/_default/examples.html
+++ b/site/layouts/_default/examples.html
@@ -76,8 +76,21 @@
/* Boosted mod: no `.btn-bd-primary` custom style */
.bd-mode-toggle {
+ --bd-mode-toggle-icon-size: 1.25rem; /* Boosted mod */
z-index: 1500;
}
+
+ .bd-mode-toggle .dropdown-menu .active .bi {
+ display: block !important;
+ }
+
+ /* Boosted mod */
+ .bd-mode-toggle .dropdown-item .bi,
+ #bd-theme .bi {
+ width: var(--bd-mode-toggle-icon-size);
+ height: var(--bd-mode-toggle-icon-size);
+ }
+ /* End mod */
{{ range .Page.Params.extra_css }}
@@ -87,18 +100,17 @@
-
-
+
-
-
+
-
-
+
@@ -115,14 +127,14 @@
-
-
diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html
index d8d57b8ca8..a3d3410141 100644
--- a/site/layouts/partials/docs-navbar.html
+++ b/site/layouts/partials/docs-navbar.html
@@ -62,14 +62,14 @@