Merge branch 'main' of https://github.com/coreui/coreui

# Conflicts: # package-lock.json # package.json # scss/sidebar/_sidebar.scss
coreui · Oct 27, 2024 · eecb98a · eecb98a
2 parents fbea794 + e811acd
commit eecb98a
Show file tree

Hide file tree

Showing 13 changed files with 1,024 additions and 1,322 deletions.
diff --git a/build/rollup.config.mjs b/build/rollup.config.mjs
@@ -20,6 +20,15 @@ const plugins = [
     exclude: 'node_modules/**',
     // Include the helpers in the bundle, at most one copy of each
     babelHelpers: 'bundled'
+  }),
+  BOOTSTRAP && replace({
+    preventAssignment: true,
+    delimiters: ['', ''],
+    '/coreui': '/coreui', // prevents changes in URLs
+    coreui: 'bs',
+    '-coreui': '-bs',
+    'coreui=': 'bs=', // [data-coreui="navigation"] => [data-bs="navigation"] (workaround for `preventAssignment` being true),
+    '--cui-': '--bs-'
   })
 ]
 const globals = {
@@ -38,10 +47,7 @@ if (BUNDLE) {
   plugins.push(
     replace({
       'process.env.NODE_ENV': '"production"',
-      preventAssignment: true,
-      ...BOOTSTRAP && {
-        'coreui.': 'bs.'
-      }
+      preventAssignment: true
     }),
     nodeResolve()
   )

diff --git a/docs/content/components/sidebar.md b/docs/content/components/sidebar.md
@@ -301,6 +301,8 @@ Sidebars use local CSS variables on `.sidebar`, `.sidebar-backdrop`, `.sidebar-n
 
 {{< scss-docs name="sidebar-narrow-css-vars" file="scss/sidebar/_sidebar-narrow.scss" >}}
 
+{{< scss-docs name="sidebar-narrow-unfoldable-css-vars" file="scss/sidebar/_sidebar-narrow.scss" >}}
+
 {{< scss-docs name="sidebar-nav-css-vars" file="scss/sidebar/_sidebar-nav.scss" >}}
 
 {{< scss-docs name="sidebar-toggler-css-vars" file="scss/sidebar/_sidebar.scss" >}}

diff --git a/docs/layouts/shortcodes/css-vars-docs.html b/docs/layouts/shortcodes/css-vars-docs.html