Skip to content

Commit eecb98a

Browse files
committed
Merge branch 'main' of https://github.com/coreui/coreui
# Conflicts: # package-lock.json # package.json # scss/sidebar/_sidebar.scss
2 parents fbea794 + e811acd commit eecb98a

File tree

13 files changed

+1024
-1322
lines changed

13 files changed

+1024
-1322
lines changed

build/rollup.config.mjs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ const plugins = [
2020
exclude: 'node_modules/**',
2121
// Include the helpers in the bundle, at most one copy of each
2222
babelHelpers: 'bundled'
23+
}),
24+
BOOTSTRAP && replace({
25+
preventAssignment: true,
26+
delimiters: ['', ''],
27+
'/coreui': '/coreui', // prevents changes in URLs
28+
coreui: 'bs',
29+
'-coreui': '-bs',
30+
'coreui=': 'bs=', // [data-coreui="navigation"] => [data-bs="navigation"] (workaround for `preventAssignment` being true),
31+
'--cui-': '--bs-'
2332
})
2433
]
2534
const globals = {
@@ -38,10 +47,7 @@ if (BUNDLE) {
3847
plugins.push(
3948
replace({
4049
'process.env.NODE_ENV': '"production"',
41-
preventAssignment: true,
42-
...BOOTSTRAP && {
43-
'coreui.': 'bs.'
44-
}
50+
preventAssignment: true
4551
}),
4652
nodeResolve()
4753
)

docs/content/components/sidebar.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ Sidebars use local CSS variables on `.sidebar`, `.sidebar-backdrop`, `.sidebar-n
301301

302302
{{< scss-docs name="sidebar-narrow-css-vars" file="scss/sidebar/_sidebar-narrow.scss" >}}
303303

304+
{{< scss-docs name="sidebar-narrow-unfoldable-css-vars" file="scss/sidebar/_sidebar-narrow.scss" >}}
305+
304306
{{< scss-docs name="sidebar-nav-css-vars" file="scss/sidebar/_sidebar-nav.scss" >}}
305307

306308
{{< scss-docs name="sidebar-toggler-css-vars" file="scss/sidebar/_sidebar.scss" >}}

docs/layouts/shortcodes/css-vars-docs.html

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)