Merge branch 'twbs:main' into mainHEADmain

8 files changed, 186 insertions, 56 deletions

diff --git a/site/data/core-team.yml b/site/data/core-team.yml
index 3552f6f38..fe6f7fbb0 100644
--- a/site/data/core-team.yml
+++ b/site/data/core-team.yml
@@ -10,17 +10,20 @@
 - name: GeoSot
   user: geosot
 
-- name: Rohit Sharma
-  user: rohit2sharma95
+- name: Patrick H. Lauke
+  user: patrickhlauke
 
-- name: alpadev
-  user: alpadev
+- name: Julien Déramond
+  user: julien-deramond
 
 - name: Gaël Poupard
   user: ffoodd
 
-- name: Patrick H. Lauke
-  user: patrickhlauke
+- name: Rohit Sharma
+  user: rohit2sharma95
+
+- name: alpadev
+  user: alpadev
 
 - name: Martijn Cuppens
   user: martijncuppens
diff --git a/site/data/docs-versions.yml b/site/data/docs-versions.yml
index 1c49d2050..a924dd231 100644
--- a/site/data/docs-versions.yml
+++ b/site/data/docs-versions.yml
@@ -2,53 +2,55 @@
   baseurl: "https://getbootstrap.com"
   description: "Every minor and patch release from v1 is listed below."
   versions:
-    - v: "1.0.0"
-    - v: "1.1.0"
-    - v: "1.1.1"
-    - v: "1.2.0"
-    - v: "1.3.0"
-    - v: "1.4.0"
+    - "1.0.0"
+    - "1.1.0"
+    - "1.1.1"
+    - "1.2.0"
+    - "1.3.0"
+    - "1.4.0"
 
 - group: v2.x
   baseurl: "https://getbootstrap.com"
   description: "Every minor and patch release from v2 is listed below."
   versions:
-    - v: "2.0.0"
-    - v: "2.0.1"
-    - v: "2.0.2"
-    - v: "2.0.3"
-    - v: "2.0.4"
-    - v: "2.1.0"
-    - v: "2.1.1"
-    - v: "2.2.0"
-    - v: "2.2.1"
-    - v: "2.2.2"
-    - v: "2.3.0"
-    - v: "2.3.1"
-    - v: "2.3.2"
+    - "2.0.0"
+    - "2.0.1"
+    - "2.0.2"
+    - "2.0.3"
+    - "2.0.4"
+    - "2.1.0"
+    - "2.1.1"
+    - "2.2.0"
+    - "2.2.1"
+    - "2.2.2"
+    - "2.3.0"
+    - "2.3.1"
+    - "2.3.2"
 
 - group: v3.x
   baseurl: "https://getbootstrap.com/docs"
-  description: "Every minor and patch release from v3 is listed below. Last update was v3.4.1."
+  description: "Every minor release from v3 is listed below. Last update was v3.4.1."
   versions:
-    - v: "3.3"
-    - v: "3.4"
+    - "3.3"
+    - "3.4"
 
 - group: v4.x
   baseurl: "https://getbootstrap.com/docs"
-  description: "Our previous major release with its minor releases. Last update was v4.6.0."
+  description: "Our previous major release with its minor releases. Last update was v4.6.2."
   versions:
-    - v: "4.0"
-    - v: "4.1"
-    - v: "4.2"
-    - v: "4.3"
-    - v: "4.4"
-    - v: "4.5"
-    - v: "4.6"
+    - "4.0"
+    - "4.1"
+    - "4.2"
+    - "4.3"
+    - "4.4"
+    - "4.5"
+    - "4.6"
 
 - group: v5.x
   baseurl: "https://getbootstrap.com/docs"
-  description: "Current major release. Last update was v5.1.3."
+  description: "Current major release. Last update was v5.3.3."
   versions:
-    - v: "5.0"
-    - v: "5.1"
+    - "5.0"
+    - "5.1"
+    - "5.2"
+    - "5.3"
diff --git a/site/data/examples.yml b/site/data/examples.yml
index 6d6419d21..99d34752b 100644
--- a/site/data/examples.yml
+++ b/site/data/examples.yml
@@ -1,3 +1,42 @@
+- category: Starters
+  external: true
+  description: "Functional examples of using Bootstrap in common JS frameworks like Webpack, Parcel, Vite, and more you can edit in StackBlitz."
+  examples:
+    - name: CDN starter
+      description: "Instantly include Bootstrap's compiled CSS and JavaScript via the jsDelivr CDN."
+      url: /examples/tree/main/starter
+    - name: Sass & JS
+      description: "Use npm to import and compile Bootstrap's Sass with Autoprefixer and Stylelint, plus our bundled JavaScript."
+      url: /examples/tree/main/sass-js
+    - name: Sass & ESM JS
+      description: "Import and compile Bootstrap's Sass with Autoprefixer and Stylelint, and compile our source JavaScript with an ESM shim."
+      url: /examples/tree/main/sass-js-esm
+    - name: Bootstrap color modes
+      description: "Import and compile Bootstrap's Sass with Stylelint, and the Bootstrap color modes."
+      url: /examples/tree/main/color-modes
+    - name: Bootstrap Icons
+      description: "Import and compile Bootstrap's Sass with Stylelint, PurgeCSS, and the Bootstrap Icons web font."
+      url: /examples/tree/main/icons-font
+    - name: Parcel
+      description: "Import and bundle Bootstrap's source Sass and JavaScript via Parcel."
+      url: /examples/tree/main/parcel
+      indexPath: src/index.html
+      indexPath: src/index.html
+    - name: React
+      description: "Import and bundle Bootstrap's source Sass and JavaScript with React, Next.js, and React Bootstrap."
+      url: /examples/tree/main/react-nextjs
+      indexPath: src/pages/index.tsx
+    - name: Vite
+      description: "Import and bundle Bootstrap's source Sass and JavaScript with Vite."
+      url: /examples/tree/main/vite
+    - name: Vue
+      description: "Import and bundle Bootstrap's source Sass and JavaScript with Vue and Vite."
+      url: /examples/tree/main/vue
+    - name: Webpack
+      description: "Import and bundle Bootstrap's source Sass and JavaScript with Webpack."
+      url: /examples/tree/main/webpack
+      indexPath: src/index.html
+
 - category: Snippets
   description: "Common patterns for building sites and apps that build on existing components and utilities with custom CSS and more."
   examples:
@@ -17,9 +56,17 @@
       description: "Extend list groups with utilities and custom styles for any content."
     - name: Modals
       description: "Transform modals to serve any purpose, from feature tours to dialogs."
+    - name: Badges
+      description: "Make badges work with custom inner HTML and new looks."
+    - name: Breadcrumbs
+      description: "Integrate custom icons and create stepper components."
+    - name: Buttons
+      description: "Create custom buttons for just about any use case with utilities."
+    - name: Jumbotrons
+      description: "Create modernized versions of the classic Bootstrap component."
 
 - category: Custom Components
-  description: "Brand new components and templates to help folks quickly get started with Bootstrap and demonstrate best practices for adding onto the framework."
+  description: "Brand-new components and templates to help folks quickly get started with Bootstrap and demonstrate best practices for adding onto the framework."
   examples:
     - name: Album
       description: "Simple one-page template for photo galleries, portfolios, and more."
@@ -63,6 +110,8 @@
   examples:
     - name: Navbars
       description: "Demonstration of all responsive and container options for the navbar."
+    - name: Navbars offcanvas
+      description: "Same as the Navbars example, but with our offcanvas component."
     - name: Navbar static
       description: "Single navbar example of a static top navbar along with some additional content."
     - name: Navbar fixed
diff --git a/site/data/icons.yml b/site/data/icons.yml
index 02727fc2f..ee5b8004c 100644
--- a/site/data/icons.yml
+++ b/site/data/icons.yml
@@ -4,24 +4,24 @@ preferred:
   - name: Feather
     website: https://feathericons.com/
   - name: Octicons
-    website: https://octicons.github.com/
+    website: https://primer.style/foundations/icons
 
 more:
   - name: Bytesize
     website: https://github.com/danklammer/bytesize-icons
   - name: CoreUI Icons
-    website: https://icons.coreui.io/
+    website: https://coreui.io/icons/
   - name: Google Material icons
-    website: https://material.io/resources/icons/
+    website: https://fonts.google.com/icons
   - name: Ionicons
-    website: https://ionicons.com/
+    website: https://ionic.io/ionicons
   - name: Dripicons
     website: http://demo.amitjakhu.com/dripicons/
   - name: Ikons
-    website: http://ikons.piotrkwiatkowski.co.uk/
+    website: https://ikons.piotrkwiatkowski.co.uk/
   - name: Icons8
     website: https://icons8.com/
   - name: icofont
     website: https://icofont.com/
-  - name: Octicons
-    website: https://primer.style/octicons/
+  - name: Tabler Icons
+    website: https://tabler.io/icons
diff --git a/site/data/plugins.yml b/site/data/plugins.yml
new file mode 100644
index 000000000..98ba5f2be
--- /dev/null
+++ b/site/data/plugins.yml
@@ -0,0 +1,47 @@
+- name: Alert
+  description: Show and hide alert messages to your users.
+  link: components/alerts/#javascript-behavior
+
+- name: Button
+  description: Programmatically control the active state for buttons.
+  link: components/buttons/#button-plugin
+
+- name: Carousel
+  description: Add slideshows to any page, including support for crossfade.
+  link: components/carousel/
+
+- name: Collapse
+  description: Expand and collapse areas of content, or create accordions.
+  link: components/collapse/
+
+- name: Dropdown
+  description: Create menus of links, actions, forms, and more.
+  link: components/dropdowns/
+
+- name: Modal
+  description: Add flexible and responsive dialogs to your project.
+  link: components/modal/
+
+- name: Offcanvas
+  description: Build and toggle hidden sidebars into any page.
+  link: components/offcanvas/
+
+- name: Popover
+  description: Create custom overlays. Built on Popper.
+  link: components/popovers/
+
+- name: Scrollspy
+  description: Automatically update active nav links based on page scroll.
+  link: components/scrollspy/
+
+- name: Tab
+  description: Allow Bootstrap nav components to toggle contents.
+  link: components/navs-tabs/
+
+- name: Toast
+  description: Show and hide notifications to your visitors.
+  link: components/toasts/
+
+- name: Tooltip
+  description: Replace browser tooltips with custom ones. Built on Popper.
+  link: components/tooltips/
diff --git a/site/data/sidebar.yml b/site/data/sidebar.yml
index df95692af..dea26b401 100644
--- a/site/data/sidebar.yml
+++ b/site/data/sidebar.yml
@@ -2,6 +2,8 @@
 # The logic for the sidebar generation is in "site/layouts/partials/docs-sidebar.html".
 
 - title: Getting started
+  icon: book-half
+  icon_color: indigo
   pages:
     - title: Introduction
     - title: Download
@@ -10,22 +12,28 @@
     - title: JavaScript
     - title: Webpack
     - title: Parcel
+    - title: Vite
     - title: Accessibility
     - title: RFS
     - title: RTL
     - title: Contribute
 
 - title: Customize
+  icon: palette2
+  icon_color: pink
   pages:
     - title: Overview
     - title: Sass
     - title: Options
     - title: Color
+    - title: Color modes
     - title: Components
     - title: CSS variables
     - title: Optimize
 
 - title: Layout
+  icon: grid-fill
+  icon_color: teal
   pages:
     - title: Breakpoints
     - title: Containers
@@ -37,6 +45,8 @@
     - title: CSS Grid
 
 - title: Content
+  icon: file-earmark-richtext
+  icon_color: gray
   pages:
     - title: Reboot
     - title: Typography
@@ -45,6 +55,8 @@
     - title: Figures
 
 - title: Forms
+  icon: ui-radios
+  icon_color: blue
   pages:
     - title: Overview
     - title: Form control
@@ -57,6 +69,8 @@
     - title: Validation
 
 - title: Components
+  icon: menu-button-wide-fill
+  icon_color: cyan
   pages:
     - title: Accordion
     - title: Alerts
@@ -71,8 +85,8 @@
     - title: Dropdowns
     - title: List group
     - title: Modal
-    - title: Navs & tabs
     - title: Navbar
+    - title: Navs & tabs
     - title: Offcanvas
     - title: Pagination
     - title: Placeholders
@@ -84,18 +98,25 @@
     - title: Tooltips
 
 - title: Helpers
+  icon: magic
+  icon_color: orange
   pages:
     - title: Clearfix
+    - title: Color & background
     - title: Colored links
-    - title: Ratio
+    - title: Focus ring
+    - title: Icon link
     - title: Position
+    - title: Ratio
     - title: Stacks
-    - title: Visually hidden
     - title: Stretched link
     - title: Text truncation
     - title: Vertical rule
+    - title: Visually hidden
 
 - title: Utilities
+  icon: braces-asterisk
+  icon_color: red
   pages:
     - title: API
     - title: Background
@@ -105,6 +126,8 @@
     - title: Flex
     - title: Float
     - title: Interactions
+    - title: Link
+    - title: Object fit
     - title: Opacity
     - title: Overflow
     - title: Position
@@ -114,13 +137,18 @@
     - title: Text
     - title: Vertical align
     - title: Visibility
+    - title: Z-index
 
 - title: Extend
+  icon: tools
+  icon_color: blue
   pages:
     - title: Approach
     - title: Icons
 
 - title: About
+  icon: globe2
+  icon_color: indigo
   pages:
     - title: Overview
     - title: Team
diff --git a/site/data/theme-colors.yml b/site/data/theme-colors.yml
index cca98e782..4c2ef8480 100644
--- a/site/data/theme-colors.yml
+++ b/site/data/theme-colors.yml
@@ -17,3 +17,4 @@
   contrast_color: dark
 - name: dark
   hex: "#343a40"
+  contrast_color: white
diff --git a/site/data/translations.yml b/site/data/translations.yml
index 6c71985d6..81bf8c2f3 100644
--- a/site/data/translations.yml
+++ b/site/data/translations.yml
@@ -1,8 +1,3 @@
-- name: العربية
-  code: ar
-  description: Bootstrap 5 باللغة العربية
-  url: https://bootstrap.mahdi.style/
-
 - name: 中文(繁體)
   code: zh-tw
   description: Bootstrap 4 繁體中文手冊
@@ -20,7 +15,7 @@
 
 - name: Japanese
   code: ja
-  description: Bootstrap 4 日本語リファレンス
+  description: Bootstrap 5 日本語リファレンス
   url: https://getbootstrap.jp/
 
 - name: Russian
@@ -42,3 +37,8 @@
   code: zh-CN
   description: Bootstrap 5 中文文档
   url: https://v5.bootcss.com/
+  
+- name: Spanish
+  code: es
+  description: Bootstrap 5 Español
+  url: https://esdocu.net/bootstrap/comenzando/