Skip to content

Commit f009cb7

Browse files
committed
Merge branch 'v4-dev' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts: # scss/_variables.scss
2 parents 94a0ba4 + 7baa0b1 commit f009cb7

File tree

18 files changed

+653
-631
lines changed

18 files changed

+653
-631
lines changed

docs/assets/js/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
})
4040
}
4141

42-
document.querySelectorAll('.bd-example .toast')
42+
document.querySelectorAll('.docs-example .toast')
4343
.forEach(function (toastNode) {
4444
var toast = new coreui.Toast(toastNode, {
4545
autohide: false

docs/assets/scss/_component-examples.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
}
202202
}
203203

204-
.bd-example-offcanvas {
204+
.docs-example-offcanvas {
205205
@include border-start-radius(0);
206206

207207
.offcanvas {

docs/assets/scss/_layout.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.wrapper {
22
width: 100%;
33
padding-left: var(--cui-sidebar-occupy-start, 0);
4-
transform: translateZ(0);
54
will-change: auto;
65
@include transition(padding .15s);
76
}

docs/content/4.0/components/badge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Add any of the below-mentioned classes to modify the presentation of a badge. Pl
5959

6060
## Pill badges
6161

62-
Apply the `.badge-pill` modifier class to make badges rounded.
62+
Apply the `.rounded-pill` modifier class to make badges rounded.
6363

6464
{{< example >}}
6565
{{< badge.inline >}}

docs/content/4.0/components/card.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ Use [border utilities]({{< docsref "/utilities/borders" >}}) to change just the
452452
{{- range (index $.Site.Data "theme-colors") }}
453453
<div class="card border-{{ .name }} mb-3" style="max-width: 18rem;">
454454
<div class="card-header">Header</div>
455-
<div class="card-body{{ if not .contrast_color }} text-{{ .name }}{{ end }}">
455+
<div class="card-body text-{{ .name }}">
456456
<h5 class="card-title">{{ .name | title }} card title</h5>
457457
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
458458
</div>
@@ -463,14 +463,14 @@ Use [border utilities]({{< docsref "/utilities/borders" >}}) to change just the
463463

464464
### Top border
465465

466-
Use [border utilities]({{< docsref "/utilities/borders" >}}) to change just the `border-color` of a card. Note that you can put `.text-{color}` classes on the parent `.card` or a subset of the card's contents as shown below.
466+
Use [border utilities]({{< docsref "/utilities/borders" >}}) to change just the `border-top-color` of a card. Note that you can put `.text-{color}` classes on the parent `.card` or a subset of the card's contents as shown below.
467467

468468
{{< example >}}
469469
{{< card.inline >}}
470470
{{- range (index $.Site.Data "theme-colors") }}
471471
<div class="card border-top-{{ .name }} border-top-3 mb-3" style="max-width: 18rem;">
472472
<div class="card-header">Header</div>
473-
<div class="card-body{{ if not .contrast_color }} text-{{ .name }}{{ end }}">
473+
<div class="card-body text-{{ .name }}">
474474
<h5 class="card-title">{{ .name | title }} card title</h5>
475475
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
476476
</div>

docs/content/4.0/components/carousel.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ Adding in the previous and next controls. We recommend using `<button>` elements
6565
{{< placeholder width="800" height="400" class="docs-placeholder-img-lg d-block w-100" color="#333" background="#555" text="Third slide" >}}
6666
</div>
6767
</div>
68-
<a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-coreui-slide="prev">
69-
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
70-
<span class="visually-hidden">Previous</span>
71-
</a>
72-
<a class="carousel-control-next" href="#carouselExampleControls" role="button" data-coreui-slide="next">
7368
<button class="carousel-control-prev" type="button" data-coreui-target="#carouselExampleControls" data-coreui-slide="prev">
7469
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
7570
<span class="visually-hidden">Previous</span>

docs/content/4.0/components/modal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ exampleModal.addEventListener('show.coreui.modal', function (event) {
517517

518518
Toggle between multiple modals with some clever placement of the `data-coreui-target` and `data-coreui-toggle` attributes. For example, you could toggle a password reset modal from within an already open sign in modal. **Please note multiple modals cannot be open at the same time**—this method simply toggles between two separate modals.
519519

520-
<div class="bd-example">
520+
<div class="docs-example">
521521
<div class="modal fade" id="exampleModalToggle" aria-hidden="true" aria-labelledby="exampleModalToggleLabel" tabindex="-1">
522522
<div class="modal-dialog modal-dialog-centered">
523523
<div class="modal-content">

docs/content/4.0/components/offcanvas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Offcanvas is a sidebar component that can be toggled via JavaScript to appear fr
2727

2828
Below is an offcanvas example that is shown by default (via `.show` on `.offcanvas`). Offcanvas includes support for a header with a close button and an optional body class for some initial `padding`. We suggest that you include offcanvas headers with dismiss actions whenever possible, or provide an explicit dismiss action.
2929

30-
{{< example class="bd-example-offcanvas p-0 bg-light overflow-hidden" >}}
30+
{{< example class="docs-example-offcanvas p-0 bg-light overflow-hidden" >}}
3131
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvas" aria-labelledby="offcanvasLabel">
3232
<div class="offcanvas-header">
3333
<h5 class="offcanvas-title" id="offcanvasLabel">Offcanvas</h5>

docs/content/4.0/components/toasts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Toasts are as flexible as you need and have very little required markup. At a mi
4545

4646
Click the button the below to show as toast (positioning with our utilities in the lower right corner) that has been hidden by default with `.hide`.
4747

48-
<div class="position-fixed bottom-0 end-0 p-3" style="z-index: 5">
48+
<div class="toaster position-fixed bottom-0 end-0 p-3" style="z-index: 5">
4949
<div id="liveToast" class="toast hide" role="alert" aria-live="assertive" aria-atomic="true">
5050
<div class="toast-header">
5151
{{< placeholder width="20" height="20" background="#007aff" class="rounded me-2" text="false" title="false" >}}
@@ -59,7 +59,7 @@ Click the button the below to show as toast (positioning with our utilities in t
5959
</div>
6060
</div>
6161

62-
<div class="bd-example">
62+
<div class="docs-example">
6363
<button type="button" class="btn btn-primary" id="liveToastBtn">Show live toast</button>
6464
</div>
6565

docs/content/4.0/components/tooltips.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
4545

4646
Hover over the links below to see tooltips:
4747

48-
<div class="bd-example tooltip-demo">
48+
<div class="docs-example tooltip-demo">
4949
<p class="muted">Placeholder text to demonstrate some <a href="#" data-coreui-toggle="tooltip" title="Default tooltip">inline links</a> with tooltips. This is now just filler, no killer. Content placed here just to mimic the presence of <a href="#" data-coreui-toggle="tooltip" title="Another tooltip">real text</a>. And all that just to give you an idea of how tooltips would look when used in real-world situations. So hopefully you've now seen how <a href="#" data-coreui-toggle="tooltip" title="Another one here too">these tooltips on links</a> can work in practice, once you use them on <a href="#" data-coreui-toggle="tooltip" title="The last tip!">your own</a> site or project.
5050
</p>
5151
</div>

0 commit comments

Comments
 (0)