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

mrholek · mrholek · commit dd3c457fa8be · 2024-05-25T23:25:55.000+02:00
diff --git a/docs/assets/scss/_layout.scss b/docs/assets/scss/_layout.scss
@@ -9,22 +9,6 @@
   }
 }
 
-.docs-layout {
-  @include media-breakpoint-up(md) {
-    display: grid;
-    grid-template-areas: "sidebar main";
-    grid-template-columns: 1fr 3fr;
-    gap: $grid-gutter-width;
-  }
-
-  @include media-breakpoint-up(lg) {
-    display: grid;
-    grid-template-areas: "sidebar main";
-    grid-template-columns: 1fr 5fr;
-    gap: $grid-gutter-width;
-  }
-}
-
 .docs-sidebar {
   grid-area: sidebar;
 }
@@ -44,7 +28,7 @@
       "toc"
       "content";
     grid-template-rows: auto auto 1fr;
-    gap: inherit;
+    gap: $grid-gutter-width;
   }
 
   @include media-breakpoint-up(lg) {
diff --git a/docs/assets/scss/_toc.scss b/docs/assets/scss/_toc.scss
@@ -52,32 +52,33 @@
   }
 
   @include media-breakpoint-down(md) {
-    border: 1px solid $border-color;
-    @include border-radius(.4rem);
+    color: var(--cui-body-color);
+    border: 1px solid var(--cui-border-color);
+    @include border-radius(var(--cui-border-radius));
 
     &:hover,
     &:focus,
     &:active,
     &[aria-expanded="true"] {
-      color: var(--cd-violet);
-      background-color: $white;
-      border-color: var(--cd-violet);
+      color: var(--cui-primary);
+      background-color: var(--cui-body-bg);
+      border-color: var(--cui-primary);
     }
 
     &:focus,
     &[aria-expanded="true"] {
-      box-shadow: 0 0 0 3px rgba(var(--cd-violet-rgb), .25);
+      box-shadow: 0 0 0 3px rgba(var(--cui-primary-rgb), .25);
     }
   }
 }
 
 .docs-toc-collapse {
   @include media-breakpoint-down(md) {
     nav {
-      padding: 1.25rem;
-      background-color: var(--cui-gray-100);
-      border: 1px solid $border-color;
-      @include border-radius(.25rem);
+      padding: 1.25rem 1.25rem 1.25rem 1rem;
+      background-color: var(--cui-tertiary-bg);
+      border: 1px solid var(--cui-border-color);
+      @include border-radius(var(--cui-border-radius));
     }
   }
 
diff --git a/docs/content/components/navs-tabs.md b/docs/content/components/navs-tabs.md
@@ -718,7 +718,7 @@ tabEl.addEventListener('shown.coreui.tab', event => {
 
 ### CSS variables
 
-Navs use local CSS variables on `.nav`, `.nav-tabs`, and `.nav-pills` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
+Navs use local CSS variables on `.nav`, `.nav-tabs`, `.nav-pills`, `.nav-underline` and `.nav-underline-border` for enhanced real-time customization. Values for the CSS variables are set via Sass, so Sass customization is still supported, too.
 
 On the `.nav` base class:
 
@@ -732,6 +732,18 @@ On the `.nav-pills` modifier class:
 
 {{< scss-docs name="nav-pills-css-vars" file="scss/_nav.scss" >}}
 
+{{< added-in "5.0.0" >}}
+
+On the `.nav-underline` modifier class:
+
+{{< scss-docs name="nav-underline-css-vars" file="scss/_nav.scss" >}}
+
+{{< added-in "5.0.0" >}}
+
+On the `.nav-underline-border` modifier class:
+
+{{< scss-docs name="nav-underline-border-css-vars" file="scss/_nav.scss" >}}
+
 ### SASS variables
 
 {{< scss-docs name="nav-variables" file="scss/_variables.scss" >}}
diff --git a/docs/data/other_frameworks.json b/docs/data/other_frameworks.json
@@ -1,78 +1,78 @@
 {
   "accordion": {
-    "angular": "https://coreui.io/angular/docs/components/accordion",
+    "angular": "https://coreui.io/angular/docs/components/accordion/",
     "bootstrap": "https://coreui.io/docs/components/accordion/",
     "react": "https://coreui.io/react/docs/components/accordion/",
     "vue": "https://coreui.io/vue/docs/components/accordion.html"
   },
   "alert": {
-    "angular": "https://coreui.io/angular/docs/components/alert",
+    "angular": "https://coreui.io/angular/docs/components/alert/",
     "bootstrap": "https://coreui.io/docs/components/alerts/",
     "react": "https://coreui.io/react/docs/components/alert/",
     "vue": "https://coreui.io/vue/docs/components/alert.html"
   },
   "avatar": {
-    "angular": "https://coreui.io/angular/docs/components/avatar",
+    "angular": "https://coreui.io/angular/docs/components/avatar/",
     "bootstrap": "https://coreui.io/docs/components/avatar/",
     "react": "https://coreui.io/react/docs/components/avatar/",
     "vue": "https://coreui.io/vue/docs/components/avatar.html"
   },
   "badge": {
-    "angular": "https://coreui.io/angular/docs/components/badge",
+    "angular": "https://coreui.io/angular/docs/components/badge/",
     "bootstrap": "https://coreui.io/docs/components/badge/",
     "react": "https://coreui.io/react/docs/components/badge/",
     "vue": "https://coreui.io/vue/docs/components/badge.html"
   },
   "breadcrumb": {
-    "angular": "https://coreui.io/angular/docs/components/breadcrumb",
+    "angular": "https://coreui.io/angular/docs/components/breadcrumb/",
     "bootstrap": "https://coreui.io/docs/components/breadcrumb/",
     "react": "https://coreui.io/react/docs/components/breadcrumb/",
     "vue": "https://coreui.io/vue/docs/components/breadcrumb.html"
   },
   "button": {
-    "angular": "https://coreui.io/angular/docs/components/button",
+    "angular": "https://coreui.io/angular/docs/components/button/",
     "bootstrap": "https://coreui.io/docs/components/buttons/",
     "react": "https://coreui.io/react/docs/components/button/",
     "vue": "https://coreui.io/vue/docs/components/button.html"
   },
   "button-group": {
-    "angular": "https://coreui.io/angular/docs/components/button-group",
+    "angular": "https://coreui.io/angular/docs/components/button-group/",
     "bootstrap": "https://coreui.io/docs/components/button-group/",
     "react": "https://coreui.io/react/docs/components/button-group/",
     "vue": "https://coreui.io/vue/docs/components/button-group.html"
   },
   "callout": {
-    "angular": "https://coreui.io/angular/docs/components/callout",
+    "angular": "https://coreui.io/angular/docs/components/callout/",
     "bootstrap": "https://coreui.io/docs/components/callout/",
     "react": "https://coreui.io/react/docs/components/callout/",
     "vue": "https://coreui.io/vue/docs/components/callout.html"
   },
   "card": {
-    "angular": "https://coreui.io/angular/docs/components/card",
+    "angular": "https://coreui.io/angular/docs/components/card/",
     "bootstrap": "https://coreui.io/docs/components/card/",
     "react": "https://coreui.io/react/docs/components/card/",
     "vue": "https://coreui.io/vue/docs/components/card.html"
   },
   "carousel": {
-    "angular": "https://coreui.io/angular/docs/components/carousel",
+    "angular": "https://coreui.io/angular/docs/components/carousel/",
     "bootstrap": "https://coreui.io/docs/components/carousel/",
     "react": "https://coreui.io/react/docs/components/carousel/",
     "vue": "https://coreui.io/vue/docs/components/carousel.html"
   },
   "checkbox": {
-    "angular": "https://coreui.io/angular/docs/forms/checks-radios",
+    "angular": "https://coreui.io/angular/docs/forms/checks-radios/",
     "bootstrap": "https://coreui.io/docs/forms/checks-radios/",
     "react": "https://coreui.io/react/docs/forms/checkbox/",
     "vue": "https://coreui.io/vue/docs/forms/checkbox.html"
   },
   "close-button": {
-    "angular": "https://coreui.io/angular/docs/components/close-button",
+    "angular": "https://coreui.io/angular/docs/components/close-button/",
     "bootstrap": "https://coreui.io/docs/components/close-button/",
     "react": "https://coreui.io/react/docs/components/close-button/",
     "vue": "https://coreui.io/vue/docs/components/close-button.html"
   },
   "collapse": {
-    "angular": "https://coreui.io/angular/docs/components/collapse",
+    "angular": "https://coreui.io/angular/docs/components/collapse/",
     "bootstrap": "https://coreui.io/docs/components/collapse/",
     "react": "https://coreui.io/react/docs/components/collapse/",
     "vue": "https://coreui.io/vue/docs/components/collapse.html"
@@ -90,55 +90,55 @@
     "vue": "https://coreui.io/vue/docs/forms/date-range-picker.html"
   },
   "dropdown": {
-    "angular": "https://coreui.io/angular/docs/components/dropdown",
+    "angular": "https://coreui.io/angular/docs/components/dropdown/",
     "bootstrap": "https://coreui.io/docs/components/dropdowns/",
     "react": "https://coreui.io/react/docs/components/dropdown/",
     "vue": "https://coreui.io/vue/docs/components/dropdown.html"
   },
   "footer": {
-    "angular": "https://coreui.io/angular/docs/components/footer",
+    "angular": "https://coreui.io/angular/docs/components/footer/",
     "bootstrap": "https://coreui.io/docs/components/footer/",
     "react": "https://coreui.io/react/docs/components/footer/",
     "vue": "https://coreui.io/vue/docs/components/footer.html"
   },
   "header": {
-    "angular": "https://coreui.io/angular/docs/components/header",
+    "angular": "https://coreui.io/angular/docs/components/header/",
     "bootstrap": "https://coreui.io/docs/components/header/",
     "react": "https://coreui.io/react/docs/components/header/",
     "vue": "https://coreui.io/vue/docs/components/header.html"
   },
   "icon": {
-    "angular": "https://coreui.io/angular/docs/components/icon",
+    "angular": "https://coreui.io/angular/docs/components/icon/",
     "bootstrap": "https://coreui.io/docs/components/icon/",
     "react": "https://coreui.io/react/docs/components/icon/",
     "vue": "https://coreui.io/vue/docs/components/icon.html"
   },
   "image": {
-    "angular": "https://coreui.io/angular/docs/components/image",
+    "angular": "https://coreui.io/angular/docs/components/image/",
     "bootstrap": "https://coreui.io/docs/content/images/",
     "react": "https://coreui.io/react/docs/components/image/",
     "vue": "https://coreui.io/vue/docs/components/image.html"
   },
   "input": {
-    "angular": "https://coreui.io/angular/docs/forms/input",
+    "angular": "https://coreui.io/angular/docs/forms/input/",
     "bootstrap": "https://coreui.io/docs/forms/form-control/",
     "react": "https://coreui.io/react/docs/forms/input/",
     "vue": "https://coreui.io/vue/docs/forms/input.html"
   },
   "input-group": {
-    "angular": "https://coreui.io/angular/docs/forms/input-group",
+    "angular": "https://coreui.io/angular/docs/forms/input-group/",
     "bootstrap": "https://coreui.io/docs/forms/input-group/",
     "react": "https://coreui.io/react/docs/forms/input-group/",
     "vue": "https://coreui.io/vue/docs/forms/input-group.html"
   },
   "floating-labels": {
-    "angular": "https://coreui.io/angular/docs/forms/floating-labels",
+    "angular": "https://coreui.io/angular/docs/forms/floating-labels/",
     "bootstrap": "https://coreui.io/docs/forms/floating-labels/",
     "react": "https://coreui.io/react/docs/forms/floating-labels/",
     "vue": "https://coreui.io/vue/docs/forms/floating-labels.html"
   },
   "list-group": {
-    "angular": "https://coreui.io/angular/docs/components/list-group",
+    "angular": "https://coreui.io/angular/docs/components/list-group/",
     "bootstrap": "https://coreui.io/docs/components/list-group/",
     "react": "https://coreui.io/react/docs/components/list-group/",
     "vue": "https://coreui.io/vue/docs/components/list-group.html"
@@ -150,7 +150,7 @@
     "vue": "https://coreui.io/vue/docs/components/loading-button.html"
   },
   "modal": {
-    "angular": "https://coreui.io/angular/docs/components/modal",
+    "angular": "https://coreui.io/angular/docs/components/modal/",
     "bootstrap": "https://coreui.io/docs/components/modal/",
     "react": "https://coreui.io/react/docs/components/modal/",
     "vue": "https://coreui.io/vue/docs/components/modal.html"
@@ -167,85 +167,85 @@
     "vue": "https://coreui.io/vue/docs/components/navbar.html"
   },
   "navs-tabs": {
-    "angular": "https://coreui.io/angular/docs/components/nav",
+    "angular": "https://coreui.io/angular/docs/components/nav/",
     "bootstrap": "https://coreui.io/docs/components/navs-tabs/",
     "react": "https://coreui.io/react/docs/components/navs-tabs/",
     "vue": "https://coreui.io/vue/docs/components/navs-tabs.html"
   },
   "offcanvas": {
-    "angular": "https://coreui.io/angular/docs/components/offcanvas",
+    "angular": "https://coreui.io/angular/docs/components/offcanvas/",
     "bootstrap": "https://coreui.io/docs/components/offcanvas/",
     "react": "https://coreui.io/react/docs/components/offcanvas/",
     "vue": "https://coreui.io/vue/docs/components/offcanvas.html"
   },
   "pagination": {
-    "angular": "https://coreui.io/angular/docs/components/pagination",
+    "angular": "https://coreui.io/angular/docs/components/pagination/",
     "bootstrap": "https://coreui.io/docs/components/pagination/",
     "react": "https://coreui.io/react/docs/components/pagination/",
     "vue": "https://coreui.io/vue/docs/components/pagination.html"
   },
   "placeholder": {
-    "angular": "https://coreui.io/angular/docs/components/placeholder",
+    "angular": "https://coreui.io/angular/docs/components/placeholder/",
     "bootstrap": "https://coreui.io/docs/components/placeholders/",
     "react": "https://coreui.io/react/docs/components/placeholder/",
     "vue": "https://coreui.io/vue/docs/components/placeholder.html"
   },
   "popover": {
-    "angular": "https://coreui.io/angular/docs/components/popover",
+    "angular": "https://coreui.io/angular/docs/components/popover/",
     "bootstrap": "https://coreui.io/docs/components/popovers/",
     "react": "https://coreui.io/react/docs/components/popover/",
     "vue": "https://coreui.io/vue/docs/components/popover.html"
   },
   "progress": {
-    "angular": "https://coreui.io/angular/docs/components/progress",
+    "angular": "https://coreui.io/angular/docs/components/progress/",
     "bootstrap": "https://coreui.io/docs/components/progress/",
     "react": "https://coreui.io/react/docs/components/progress/",
     "vue": "https://coreui.io/vue/docs/components/progress.html"
   },
   "radio": {
-    "angular": "https://coreui.io/angular/docs/forms/checks-radios",
+    "angular": "https://coreui.io/angular/docs/forms/checks-radios/",
     "bootstrap": "https://coreui.io/docs/forms/checks-radios/",
     "react": "https://coreui.io/react/docs/forms/radio/",
     "vue": "https://coreui.io/vue/docs/forms/radio.html"
   },
   "range": {
-    "angular": "https://coreui.io/angular/docs/forms/range",
+    "angular": "https://coreui.io/angular/docs/forms/range/",
     "bootstrap": "https://coreui.io/docs/forms/range/",
     "react": "https://coreui.io/react/docs/forms/range/",
     "vue": "https://coreui.io/vue/docs/forms/range.html"
   },
   "select": {
-    "angular": "https://coreui.io/angular/docs/forms/select",
+    "angular": "https://coreui.io/angular/docs/forms/select/",
     "bootstrap": "https://coreui.io/docs/forms/select/",
     "react": "https://coreui.io/react/docs/forms/select/",
     "vue": "https://coreui.io/vue/docs/forms/select.html"
   },
   "sidebar": {
-    "angular": "https://coreui.io/angular/docs/components/sidebar",
+    "angular": "https://coreui.io/angular/docs/components/sidebar/",
     "bootstrap": "https://coreui.io/docs/components/sidebar/",
     "react": "https://coreui.io/react/docs/components/sidebar/",
     "vue": "https://coreui.io/vue/docs/components/sidebar.html"
   },
   "spinner": {
-    "angular": "https://coreui.io/angular/docs/components/spinner",
+    "angular": "https://coreui.io/angular/docs/components/spinner/",
     "bootstrap": "https://coreui.io/docs/components/spinners/",
     "react": "https://coreui.io/react/docs/components/spinner/",
     "vue": "https://coreui.io/vue/docs/components/spinner.html"
   },
   "switch": {
-    "angular": "https://coreui.io/angular/docs/forms/checks-radios",
+    "angular": "https://coreui.io/angular/docs/forms/checks-radios/",
     "bootstrap": "https://coreui.io/docs/forms/checks-radios/",
     "react": "https://coreui.io/react/docs/forms/switch/",
     "vue": "https://coreui.io/vue/docs/forms/switch.html"
   },
   "table": {
-    "angular": "https://coreui.io/angular/docs/components/table",
+    "angular": "https://coreui.io/angular/docs/components/table/",
     "bootstrap": "https://coreui.io/docs/content/tables/",
     "react": "https://coreui.io/react/docs/components/table/",
     "vue": "https://coreui.io/vue/docs/components/table.html"
   },
   "textarea": {
-    "angular": "https://coreui.io/angular/docs/forms/form-control",
+    "angular": "https://coreui.io/angular/docs/forms/form-control/",
     "bootstrap": "https://coreui.io/docs/forms/form-control/",
     "react": "https://coreui.io/react/docs/forms/textarea/",
     "vue": "https://coreui.io/vue/docs/forms/textarea.html"
@@ -257,13 +257,13 @@
     "vue": "https://coreui.io/vue/docs/forms/time-picker.html"
   },
   "toast": {
-    "angular": "https://coreui.io/angular/docs/components/toast",
+    "angular": "https://coreui.io/angular/docs/components/toast/",
     "bootstrap": "https://coreui.io/docs/components/toasts/",
     "react": "https://coreui.io/react/docs/components/toast/",
     "vue": "https://coreui.io/vue/docs/components/toast.html"
   },
   "tooltip": {
-    "angular": "https://coreui.io/angular/docs/components/tooltip",
+    "angular": "https://coreui.io/angular/docs/components/tooltip/",
     "bootstrap": "https://coreui.io/docs/components/tooltips/",
     "react": "https://coreui.io/react/docs/components/tooltip/",
     "vue": "https://coreui.io/vue/docs/components/tooltip.html"
diff --git a/scss/_nav.scss b/scss/_nav.scss
diff --git a/scss/_variables.scss b/scss/_variables.scss

Original file line number	Diff line number	Diff line change
`@@ -52,32 +52,33 @@`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@include media-breakpoint-down(md) {`
`55`		`- border: 1px solid $border-color;`
`56`		`- @include border-radius(.4rem);`
	`55`	`+ color: var(--cui-body-color);`
	`56`	`+ border: 1px solid var(--cui-border-color);`
	`57`	`+ @include border-radius(var(--cui-border-radius));`
`57`	`58`
`58`	`59`	`&:hover,`
`59`	`60`	`&:focus,`
`60`	`61`	`&:active,`
`61`	`62`	`&[aria-expanded="true"] {`
`62`		`- color: var(--cd-violet);`
`63`		`- background-color: $white;`
`64`		`- border-color: var(--cd-violet);`
	`63`	`+ color: var(--cui-primary);`
	`64`	`+ background-color: var(--cui-body-bg);`
	`65`	`+ border-color: var(--cui-primary);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`&:focus,`
`68`	`69`	`&[aria-expanded="true"] {`
`69`		`- box-shadow: 0 0 0 3px rgba(var(--cd-violet-rgb), .25);`
	`70`	`+ box-shadow: 0 0 0 3px rgba(var(--cui-primary-rgb), .25);`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`.docs-toc-collapse {`
`75`	`76`	`@include media-breakpoint-down(md) {`
`76`	`77`	`nav {`
`77`		`- padding: 1.25rem;`
`78`		`- background-color: var(--cui-gray-100);`
`79`		`- border: 1px solid $border-color;`
`80`		`- @include border-radius(.25rem);`
	`78`	`+ padding: 1.25rem 1.25rem 1.25rem 1rem;`
	`79`	`+ background-color: var(--cui-tertiary-bg);`
	`80`	`+ border: 1px solid var(--cui-border-color);`
	`81`	`+ @include border-radius(var(--cui-border-radius));`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`