Skip to content

Commit 2c7e39c

Browse files
committed
v6: docs - Update utility class names in docs and examples
Replace deprecated utility classes with the updated names across site docs and examples. Changes include switching text-* classes to fg-*, text-bg-* badge classes to theme-*, and replacing clearfix with d-flow-root. Affected files: cover and drawer-navbar examples, spinner example, reboot, accessibility, columns docs, and versions page to keep examples consistent with the new utility naming. Add btn-icon class to navbar toggler Add the btn-icon utility class to the navbar toggler button in the navbar-fixed example to apply icon button styling. This change updates site/src/assets/examples/navbar-fixed/index.astro and keeps the existing SVG toggler markup and collapse behavior unchanged.
1 parent 2beb42e commit 2c7e39c

17 files changed

Lines changed: 68 additions & 68 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import Placeholder from "@shortcodes/Placeholder.astro"
2121
<header class="border-bottom lh-1 py-3">
2222
<div class="row flex-nowrap justify-content-between align-items-center">
2323
<div class="col-4 pt-1">
24-
<a class="link-secondary" href="#">Subscribe</a>
24+
<a class="theme-secondary" href="#">Subscribe</a>
2525
</div>
2626
<div class="col-4 text-center">
2727
<a class="blog-header-logo text-body-emphasis text-decoration-none" href="#">Large</a>
2828
</div>
2929
<div class="col-4 d-flex justify-content-end align-items-center">
30-
<a class="link-secondary" href="#" aria-label="Search">
30+
<a class="theme-secondary" href="#" aria-label="Search">
3131
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" class="mx-3" role="img" viewBox="0 0 24 24"><title>Search</title><circle cx="10.5" cy="10.5" r="7.5"/><path d="M21 21l-5.2-5.2"/></svg>
3232
</a>
3333
<a class="btn-outline theme-secondary btn-sm" href="#">Sign up</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export const extra_js = [
128128

129129
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 fg-2 text-uppercase">
130130
<span>Saved reports</span>
131-
<a class="link-secondary" href="#" aria-label="Add a new report">
131+
<a class="theme-secondary" href="#" aria-label="Add a new report">
132132
<svg class="bi" aria-hidden="true"><use href="#plus-circle"/></svg>
133133
</a>
134134
</h6>

site/src/assets/examples/drawer-navbar/index.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import Placeholder from "@shortcodes/Placeholder.astro"
5252
<a class="nav-link active" aria-current="page" href="#">Dashboard</a>
5353
<a class="nav-link" href="#">
5454
Friends
55-
<span class="badge text-bg-light rounded-pill align-text-bottom">27</span>
55+
<span class="badge theme-secondary rounded-pill align-text-bottom">27</span>
5656
</a>
5757
<a class="nav-link" href="#">Explore</a>
5858
<a class="nav-link" href="#">Suggestions</a>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const extra_css = ['headers.css']
7272
</div>
7373

7474
<ul class="nav col-12 md:col-auto mb-2 justify-content-center md:mb-0">
75-
<li><a href="#" class="nav-link px-2 link-secondary">Home</a></li>
75+
<li><a href="#" class="nav-link px-2 theme-secondary">Home</a></li>
7676
<li><a href="#" class="nav-link px-2">Features</a></li>
7777
<li><a href="#" class="nav-link px-2">Pricing</a></li>
7878
<li><a href="#" class="nav-link px-2">FAQs</a></li>
@@ -125,7 +125,7 @@ export const extra_css = ['headers.css']
125125
</a>
126126

127127
<ul class="nav col-12 lg:col-auto lg:me-auto mb-2 justify-content-center md:mb-0">
128-
<li><a href="#" class="nav-link px-2 link-secondary">Overview</a></li>
128+
<li><a href="#" class="nav-link px-2 theme-secondary">Overview</a></li>
129129
<li><a href="#" class="nav-link px-2 link-body-emphasis">Inventory</a></li>
130130
<li><a href="#" class="nav-link px-2 link-body-emphasis">Customers</a></li>
131131
<li><a href="#" class="nav-link px-2 link-body-emphasis">Products</a></li>

site/src/assets/examples/navbar-fixed/index.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const extra_css = ['navbar-fixed.css']
88
<nav class="navbar md:navbar-expand navbar-dark fixed-top bg-dark">
99
<div class="container-fluid">
1010
<a class="navbar-brand" href="#">Fixed navbar</a>
11-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
11+
<button class="btn-icon navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
1212
<svg class="navbar-toggler-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round"><path d="M1 3.5h14M1 8h14M1 12.5h14"/></svg>
1313
</button>
1414
<div class="collapse navbar-collapse" id="navbarCollapse">

site/src/assets/examples/navbars-drawer/index.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const extra_css = ['navbars-drawer.css']
99
<nav class="navbar navbar-dark bg-dark" aria-label="Dark drawer navbar">
1010
<div class="container-fluid">
1111
<a class="navbar-brand" href="#">Dark drawer navbar</a>
12-
<button class="navbar-toggler" type="button" data-bs-toggle="drawer" data-bs-target="#drawerNavbarDark" aria-controls="drawerNavbarDark" aria-label="Toggle navigation">
12+
<button class="btn-icon navbar-toggler" type="button" data-bs-toggle="drawer" data-bs-target="#drawerNavbarDark" aria-controls="drawerNavbarDark" aria-label="Toggle navigation">
1313
<svg class="navbar-toggler-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round"><path d="M1 3.5h14M1 8h14M1 12.5h14"/></svg>
1414
</button>
1515
<dialog class="drawer drawer-end text-bg-dark" tabindex="-1" id="drawerNavbarDark" aria-labelledby="drawerNavbarDarkLabel">
@@ -49,7 +49,7 @@ export const extra_css = ['navbars-drawer.css']
4949
<nav class="navbar bg-body-tertiary" aria-label="Light drawer navbar">
5050
<div class="container-fluid">
5151
<a class="navbar-brand" href="#">Light drawer navbar</a>
52-
<button class="navbar-toggler" type="button" data-bs-toggle="drawer" data-bs-target="#drawerNavbarLight" aria-controls="drawerNavbarLight" aria-label="Toggle navigation">
52+
<button class="btn-icon navbar-toggler" type="button" data-bs-toggle="drawer" data-bs-target="#drawerNavbarLight" aria-controls="drawerNavbarLight" aria-label="Toggle navigation">
5353
<svg class="navbar-toggler-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round"><path d="M1 3.5h14M1 8h14M1 12.5h14"/></svg>
5454
</button>
5555
<dialog class="drawer drawer-end" tabindex="-1" id="drawerNavbarLight" aria-labelledby="drawerNavbarLightLabel">
@@ -89,7 +89,7 @@ export const extra_css = ['navbars-drawer.css']
8989
<nav class="navbar lg:navbar-expand navbar-dark bg-dark" aria-label="Drawer navbar large">
9090
<div class="container-fluid">
9191
<a class="navbar-brand" href="#">Responsive drawer navbar</a>
92-
<button class="navbar-toggler" type="button" data-bs-toggle="drawer" data-bs-target="#drawerNavbar2" aria-controls="drawerNavbar2" aria-label="Toggle navigation">
92+
<button class="btn-icon navbar-toggler" type="button" data-bs-toggle="drawer" data-bs-target="#drawerNavbar2" aria-controls="drawerNavbar2" aria-label="Toggle navigation">
9393
<svg class="navbar-toggler-icon" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round"><path d="M1 3.5h14M1 8h14M1 12.5h14"/></svg>
9494
</button>
9595
<dialog class="drawer drawer-end text-bg-dark" tabindex="-1" id="drawerNavbar2" aria-labelledby="drawerNavbar2Label">

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,30 +155,30 @@ export const extra_css = ['pricing.css']
155155
<div class="col-6 md:col">
156156
<h5>Features</h5>
157157
<ul class="list-unstyled text-small">
158-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Cool stuff</a></li>
159-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Random feature</a></li>
160-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Team feature</a></li>
161-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Stuff for developers</a></li>
162-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Another one</a></li>
163-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Last time</a></li>
158+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Cool stuff</a></li>
159+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Random feature</a></li>
160+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Team feature</a></li>
161+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Stuff for developers</a></li>
162+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Another one</a></li>
163+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Last time</a></li>
164164
</ul>
165165
</div>
166166
<div class="col-6 md:col">
167167
<h5>Resources</h5>
168168
<ul class="list-unstyled text-small">
169-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Resource</a></li>
170-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Resource name</a></li>
171-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Another resource</a></li>
172-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Final resource</a></li>
169+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Resource</a></li>
170+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Resource name</a></li>
171+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Another resource</a></li>
172+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Final resource</a></li>
173173
</ul>
174174
</div>
175175
<div class="col-6 md:col">
176176
<h5>About</h5>
177177
<ul class="list-unstyled text-small">
178-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Team</a></li>
179-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Locations</a></li>
180-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Privacy</a></li>
181-
<li class="mb-1"><a class="link-secondary text-decoration-none" href="#">Terms</a></li>
178+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Team</a></li>
179+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Locations</a></li>
180+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Privacy</a></li>
181+
<li class="mb-1"><a class="theme-secondary text-decoration-none" href="#">Terms</a></li>
182182
</ul>
183183
</div>
184184
</div>

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,39 +148,39 @@ export const extra_css = ['product.css']
148148
<div class="col-6 md:col">
149149
<h5>Features</h5>
150150
<ul class="list-unstyled text-small">
151-
<li><a class="link-secondary text-decoration-none" href="#">Cool stuff</a></li>
152-
<li><a class="link-secondary text-decoration-none" href="#">Random feature</a></li>
153-
<li><a class="link-secondary text-decoration-none" href="#">Team feature</a></li>
154-
<li><a class="link-secondary text-decoration-none" href="#">Stuff for developers</a></li>
155-
<li><a class="link-secondary text-decoration-none" href="#">Another one</a></li>
156-
<li><a class="link-secondary text-decoration-none" href="#">Last time</a></li>
151+
<li><a class="theme-secondary text-decoration-none" href="#">Cool stuff</a></li>
152+
<li><a class="theme-secondary text-decoration-none" href="#">Random feature</a></li>
153+
<li><a class="theme-secondary text-decoration-none" href="#">Team feature</a></li>
154+
<li><a class="theme-secondary text-decoration-none" href="#">Stuff for developers</a></li>
155+
<li><a class="theme-secondary text-decoration-none" href="#">Another one</a></li>
156+
<li><a class="theme-secondary text-decoration-none" href="#">Last time</a></li>
157157
</ul>
158158
</div>
159159
<div class="col-6 md:col">
160160
<h5>Resources</h5>
161161
<ul class="list-unstyled text-small">
162-
<li><a class="link-secondary text-decoration-none" href="#">Resource name</a></li>
163-
<li><a class="link-secondary text-decoration-none" href="#">Resource</a></li>
164-
<li><a class="link-secondary text-decoration-none" href="#">Another resource</a></li>
165-
<li><a class="link-secondary text-decoration-none" href="#">Final resource</a></li>
162+
<li><a class="theme-secondary text-decoration-none" href="#">Resource name</a></li>
163+
<li><a class="theme-secondary text-decoration-none" href="#">Resource</a></li>
164+
<li><a class="theme-secondary text-decoration-none" href="#">Another resource</a></li>
165+
<li><a class="theme-secondary text-decoration-none" href="#">Final resource</a></li>
166166
</ul>
167167
</div>
168168
<div class="col-6 md:col">
169169
<h5>Resources</h5>
170170
<ul class="list-unstyled text-small">
171-
<li><a class="link-secondary text-decoration-none" href="#">Business</a></li>
172-
<li><a class="link-secondary text-decoration-none" href="#">Education</a></li>
173-
<li><a class="link-secondary text-decoration-none" href="#">Government</a></li>
174-
<li><a class="link-secondary text-decoration-none" href="#">Gaming</a></li>
171+
<li><a class="theme-secondary text-decoration-none" href="#">Business</a></li>
172+
<li><a class="theme-secondary text-decoration-none" href="#">Education</a></li>
173+
<li><a class="theme-secondary text-decoration-none" href="#">Government</a></li>
174+
<li><a class="theme-secondary text-decoration-none" href="#">Gaming</a></li>
175175
</ul>
176176
</div>
177177
<div class="col-6 md:col">
178178
<h5>About</h5>
179179
<ul class="list-unstyled text-small">
180-
<li><a class="link-secondary text-decoration-none" href="#">Team</a></li>
181-
<li><a class="link-secondary text-decoration-none" href="#">Locations</a></li>
182-
<li><a class="link-secondary text-decoration-none" href="#">Privacy</a></li>
183-
<li><a class="link-secondary text-decoration-none" href="#">Terms</a></li>
180+
<li><a class="theme-secondary text-decoration-none" href="#">Team</a></li>
181+
<li><a class="theme-secondary text-decoration-none" href="#">Locations</a></li>
182+
<li><a class="theme-secondary text-decoration-none" href="#">Privacy</a></li>
183+
<li><a class="theme-secondary text-decoration-none" href="#">Terms</a></li>
184184
</ul>
185185
</div>
186186
</div>

site/src/components/home/MastHead.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ import ResponsiveImage from '@layouts/partials/ResponsiveImage.astro'
5050
<p class="fg-2 mb-0">
5151
Currently <strong>v{getConfig().current_version}</strong>
5252
<span class="px-1">&middot;</span>
53-
<a href={getVersionedDocsPath('getting-started/install')} class="link-secondary">Download</a>
53+
<a href={getVersionedDocsPath('getting-started/install')} class="theme-secondary">Download</a>
5454
<span class="px-1">&middot;</span>
55-
<a href="/docs/versions/" class="link-secondary text-nowrap">All releases</a>
55+
<a href="/docs/versions/" class="theme-secondary text-nowrap">All releases</a>
5656
</p>
5757
<Ads />
5858
</div>

site/src/content/docs/components/navbar.mdx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Place various form controls and components within a navbar:
246246
<div class="container-fluid">
247247
<form class="d-flex" role="search">
248248
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
249-
<button class="btn btn-outline-success" type="submit">Search</button>
249+
<button class="btn-outline theme-success" type="submit">Search</button>
250250
</form>
251251
</div>
252252
</nav>`} />
@@ -258,7 +258,7 @@ Immediate child elements of `.navbar` use flex layout and will default to `justi
258258
<a class="navbar-brand">Navbar</a>
259259
<form class="d-flex" role="search">
260260
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
261-
<button class="btn btn-outline-success" type="submit">Search</button>
261+
<button class="btn-outline theme-success" type="submit">Search</button>
262262
</form>
263263
</div>
264264
</nav>`} />
@@ -278,8 +278,8 @@ Various buttons are supported as part of these navbar forms, too. This is also a
278278

279279
<Example code={`<nav class="navbar bg-1 fg-2">
280280
<form class="container-fluid justify-content-start">
281-
<button class="btn btn-outline-success me-2" type="button">Main button</button>
282-
<button class="btn btn-sm btn-outline-secondary" type="button">Smaller button</button>
281+
<button class="btn-outline theme-success me-2" type="button">Main button</button>
282+
<button class="btn-outline theme-secondary btn-sm" type="button">Smaller button</button>
283283
</form>
284284
</nav>`} />
285285

@@ -433,7 +433,7 @@ Navbar themes are easier than ever thanks to Bootstrap’s combination of Sass a
433433
</ul>
434434
<form class="d-flex" role="search">
435435
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
436-
<button class="btn btn-outline theme-secondary" type="submit">Search</button>
436+
<button class="btn-outline theme-secondary" type="submit">Search</button>
437437
</form>
438438
</div>
439439
</dialog>
@@ -468,7 +468,7 @@ Navbar themes are easier than ever thanks to Bootstrap’s combination of Sass a
468468
</ul>
469469
<form class="d-flex" role="search">
470470
<input class="form-control me-2" data-bs-theme="light" type="search" placeholder="Search" aria-label="Search"/>
471-
<button class="btn btn-solid theme-inverse" type="submit">Search</button>
471+
<button class="btn-solid theme-inverse" type="submit">Search</button>
472472
</form>
473473
</div>
474474
</dialog>
@@ -503,7 +503,7 @@ Navbar themes are easier than ever thanks to Bootstrap’s combination of Sass a
503503
</ul>
504504
<form class="d-flex" role="search">
505505
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
506-
<button class="btn btn-outline-primary" type="submit">Search</button>
506+
<button class="btn-outline theme-primary" type="submit">Search</button>
507507
</form>
508508
</div>
509509
</dialog>
@@ -645,7 +645,7 @@ With no `.navbar-brand` shown (hidden inside the drawer):
645645
</ul>
646646
<form class="d-flex" role="search">
647647
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
648-
<button class="btn btn-outline-success" type="submit">Search</button>
648+
<button class="btn-outline theme-success" type="submit">Search</button>
649649
</form>
650650
</div>
651651
</dialog>
@@ -673,7 +673,7 @@ With a brand name shown on the left and toggler on the right:
673673
</ul>
674674
<form class="d-flex" role="search">
675675
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
676-
<button class="btn btn-outline-success" type="submit">Search</button>
676+
<button class="btn-outline theme-success" type="submit">Search</button>
677677
</form>
678678
</div>
679679
</dialog>
@@ -701,7 +701,7 @@ With a toggler on the left and brand name on the right:
701701
</ul>
702702
<form class="d-flex" role="search">
703703
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"/>
704-
<button class="btn btn-outline-success" type="submit">Search</button>
704+
<button class="btn-outline theme-success" type="submit">Search</button>
705705
</form>
706706
</div>
707707
</dialog>

0 commit comments

Comments
 (0)