Skip to content

Commit 8e7ab20

Browse files
Examples: fix stale v5 CSS custom properties and migrate breadcrumb example to v6 divider markup (#42748)
1 parent 19beaf0 commit 8e7ab20

8 files changed

Lines changed: 45 additions & 52 deletions

File tree

site/src/assets/examples/breadcrumbs/breadcrumbs.css

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,8 @@
1-
.breadcrumb-chevron {
2-
--bs-breadcrumb-divider: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%236c757d'%3E%3Cpath fill-rule='evenodd' d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3E%3C/svg%3E");
3-
gap: .5rem;
4-
}
5-
.breadcrumb-chevron .breadcrumb-item {
6-
display: flex;
7-
gap: inherit;
8-
align-items: center;
9-
padding-left: 0;
10-
line-height: 1;
11-
}
12-
.breadcrumb-chevron .breadcrumb-item::before {
13-
gap: inherit;
14-
float: none;
15-
width: 1rem;
16-
height: 1rem;
17-
}
18-
191
.breadcrumb-custom .breadcrumb-item {
202
position: relative;
213
flex-grow: 1;
224
padding: .75rem 3rem;
235
}
24-
.breadcrumb-custom .breadcrumb-item::before {
25-
display: none;
26-
}
276
.breadcrumb-custom .breadcrumb-item::after {
287
position: absolute;
298
top: 50%;
@@ -34,7 +13,7 @@
3413
height: 50px;
3514
margin-top: -25px;
3615
content: "";
37-
background-color: var(--bs-tertiary-bg);
16+
background-color: var(--bs-bg-3);
3817
border-top-right-radius: .5rem;
3918
box-shadow: 1px -1px var(--bs-border-color);
4019
transform: scale(.707) rotate(45deg);

site/src/assets/examples/breadcrumbs/index.astro

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ export const extra_css = ['breadcrumbs.css']
1212
<div class="container my-5">
1313
<nav aria-label="breadcrumb">
1414
<ol class="breadcrumb p-3 bg-1 rounded-3">
15-
<li class="breadcrumb-item"><a href="#">Home</a></li>
16-
<li class="breadcrumb-item"><a href="#">Library</a></li>
17-
<li class="breadcrumb-item active" aria-current="page">Data</li>
15+
<li class="breadcrumb-item"><a class="breadcrumb-link" href="#">Home</a></li>
16+
<li class="breadcrumb-divider"></li>
17+
<li class="breadcrumb-item"><a class="breadcrumb-link" href="#">Library</a></li>
18+
<li class="breadcrumb-divider"></li>
19+
<li class="breadcrumb-item" aria-current="page"><a class="breadcrumb-link active" href="#">Data</a></li>
1820
</ol>
1921
</nav>
2022
</div>
@@ -25,16 +27,18 @@ export const extra_css = ['breadcrumbs.css']
2527
<nav aria-label="breadcrumb">
2628
<ol class="breadcrumb p-3 bg-1 rounded-3">
2729
<li class="breadcrumb-item">
28-
<a class="theme-inverse" href="#">
30+
<a class="breadcrumb-link theme-inverse" href="#">
2931
<svg class="bi" width="16" height="16" aria-hidden="true"><use href="#house-door-fill"></use></svg>
3032
<span class="visually-hidden">Home</span>
3133
</a>
3234
</li>
35+
<li class="breadcrumb-divider"></li>
3336
<li class="breadcrumb-item">
34-
<a class="theme-inverse fw-semibold text-decoration-none" href="#">Library</a>
37+
<a class="breadcrumb-link theme-inverse fw-semibold text-decoration-none" href="#">Library</a>
3538
</li>
36-
<li class="breadcrumb-item active" aria-current="page">
37-
Data
39+
<li class="breadcrumb-divider"></li>
40+
<li class="breadcrumb-item" aria-current="page">
41+
<a class="breadcrumb-link active" href="#">Data</a>
3842
</li>
3943
</ol>
4044
</nav>
@@ -44,18 +48,28 @@ export const extra_css = ['breadcrumbs.css']
4448

4549
<div class="container my-5">
4650
<nav aria-label="breadcrumb">
47-
<ol class="breadcrumb breadcrumb-chevron p-3 bg-1 rounded-3">
51+
<ol class="breadcrumb p-3 bg-1 rounded-3">
4852
<li class="breadcrumb-item">
49-
<a class="theme-inverse" href="#">
53+
<a class="breadcrumb-link theme-inverse" href="#">
5054
<svg class="bi" width="16" height="16" aria-hidden="true"><use href="#house-door-fill"></use></svg>
5155
<span class="visually-hidden">Home</span>
5256
</a>
5357
</li>
58+
<li class="breadcrumb-divider">
59+
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
60+
<path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
61+
</svg>
62+
</li>
5463
<li class="breadcrumb-item">
55-
<a class="theme-inverse fw-semibold text-decoration-none" href="#">Library</a>
64+
<a class="breadcrumb-link theme-inverse fw-semibold text-decoration-none" href="#">Library</a>
5665
</li>
57-
<li class="breadcrumb-item active" aria-current="page">
58-
Data
66+
<li class="breadcrumb-divider">
67+
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
68+
<path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
69+
</svg>
70+
</li>
71+
<li class="breadcrumb-item" aria-current="page">
72+
<a class="breadcrumb-link active" href="#">Data</a>
5973
</li>
6074
</ol>
6175
</nav>

site/src/assets/examples/carousel/carousel.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
body {
66
padding-top: 3rem;
77
padding-bottom: 3rem;
8-
color: var(--bs-tertiary-color);
8+
color: var(--bs-fg-3);
99
}
1010

1111

site/src/assets/examples/cheatsheet/cheatsheet.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@ body {
2626
padding: .1875rem .5rem;
2727
margin-top: .125rem;
2828
margin-left: .3125rem;
29-
color: var(--bs-body-color);
29+
color: var(--bs-fg-body);
3030
}
3131

3232
.bd-aside a:hover,
3333
.bd-aside a:focus {
34-
color: var(--bs-body-color);
34+
color: var(--bs-fg-body);
3535
background-color: rgba(121, 82, 179, .1);
3636
}
3737

3838
.bd-aside .active {
3939
font-weight: 600;
40-
color: var(--bs-body-color);
40+
color: var(--bs-fg-body);
4141
}
4242

4343
.bd-aside .btn {
4444
padding: .25rem .5rem;
4545
font-weight: 600;
46-
color: var(--bs-body-color);
46+
color: var(--bs-fg-body);
4747
}
4848

4949
.bd-aside .btn:hover,
5050
.bd-aside .btn:focus {
51-
color: var(--bs-body-color);
51+
color: var(--bs-fg-body);
5252
background-color: rgba(121, 82, 179, .1);
5353
}
5454

site/src/assets/examples/headers/headers.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.form-control-dark {
2-
border-color: var(--bs-gray);
2+
border-color: var(--bs-gray-500);
33
}
44
.form-control-dark:focus {
55
border-color: #fff;

site/src/assets/examples/list-groups/list-groups.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
}
2828
.list-group-item-check:checked + .list-group-item {
2929
color: #fff;
30-
background-color: var(--bs-primary);
31-
border-color: var(--bs-primary);
30+
background-color: var(--bs-primary-bg);
31+
border-color: var(--bs-primary-bg);
3232
}
3333
.list-group-item-check[disabled] + .list-group-item,
3434
.list-group-item-check:disabled + .list-group-item {
@@ -51,9 +51,9 @@
5151
}
5252

5353
.list-group-radio .radio:checked + .list-group-item {
54-
background-color: var(--bs-body);
55-
border-color: var(--bs-primary);
56-
box-shadow: 0 0 0 2px var(--bs-primary);
54+
background-color: var(--bs-bg-body);
55+
border-color: var(--bs-primary-bg);
56+
box-shadow: 0 0 0 2px var(--bs-primary-bg);
5757
}
5858
.list-group-radio .radio[disabled] + .list-group-item,
5959
.list-group-radio .radio:disabled + .list-group-item {

site/src/assets/examples/pricing/pricing.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
body {
2-
background-image: linear-gradient(180deg, var(--bs-secondary-bg), var(--bs-body-bg) 100px, var(--bs-body-bg));
2+
background-image: linear-gradient(180deg, var(--bs-secondary-bg), var(--bs-bg-body) 100px, var(--bs-bg-body));
33
}
44

55
.container {

site/src/assets/examples/sidebars/sidebars.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ main {
1717
.btn-toggle {
1818
padding: .25rem .5rem;
1919
font-weight: 600;
20-
color: var(--bs-emphasis-color);
20+
color: var(--bs-fg-1);
2121
background-color: transparent;
2222
}
2323
.btn-toggle:hover,
2424
.btn-toggle:focus {
25-
color: rgba(var(--bs-emphasis-color-rgb), .85);
26-
background-color: var(--bs-tertiary-bg);
25+
color: color-mix(in oklab, var(--bs-fg-1), transparent 15%);
26+
background-color: var(--bs-bg-3);
2727
}
2828

2929
.btn-toggle::before {
@@ -39,7 +39,7 @@ main {
3939
}
4040

4141
.btn-toggle[aria-expanded="true"] {
42-
color: rgba(var(--bs-emphasis-color-rgb), .85);
42+
color: color-mix(in oklab, var(--bs-fg-1), transparent 15%);
4343
}
4444
.btn-toggle[aria-expanded="true"]::before {
4545
transform: rotate(90deg);
@@ -52,7 +52,7 @@ main {
5252
}
5353
.btn-toggle-nav a:hover,
5454
.btn-toggle-nav a:focus {
55-
background-color: var(--bs-tertiary-bg);
55+
background-color: var(--bs-bg-3);
5656
}
5757

5858
.scrollarea {

0 commit comments

Comments
 (0)