aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéophile Helleboid - chtitux <[email protected]>2021-01-08 22:53:04 +0400
committerGitHub <[email protected]>2021-01-08 20:53:04 +0200
commit80557b3ac02bb21823a483013d9a0af5203bb7c2 (patch)
treea5b797e390c52c7ec6fc8c6fb935b8b3eb949b80
parent70175db4294641c91e825b5e2555e7d7d398e320 (diff)
downloadbootstrap-80557b3ac02bb21823a483013d9a0af5203bb7c2.tar.xz
bootstrap-80557b3ac02bb21823a483013d9a0af5203bb7c2.zip
Move "active" class from `.nav-item` to `.nav-link` (#32730)
-rw-r--r--js/tests/unit/scrollspy.spec.js4
-rw-r--r--js/tests/visual/dropdown.html4
-rw-r--r--js/tests/visual/modal.html4
-rw-r--r--site/content/docs/5.0/examples/navbar-bottom/index.html4
-rw-r--r--site/content/docs/5.0/examples/navbar-fixed/index.html4
-rw-r--r--site/content/docs/5.0/examples/navbar-static/index.html4
-rw-r--r--site/content/docs/5.0/examples/navbars/index.html48
-rw-r--r--site/content/docs/5.0/examples/offcanvas/index.html4
-rw-r--r--site/content/docs/5.0/examples/starter-template/index.html4
-rw-r--r--site/content/docs/5.0/examples/sticky-footer-navbar/index.html4
10 files changed, 42 insertions, 42 deletions
diff --git a/js/tests/unit/scrollspy.spec.js b/js/tests/unit/scrollspy.spec.js
index 45de56fbe..eab9183aa 100644
--- a/js/tests/unit/scrollspy.spec.js
+++ b/js/tests/unit/scrollspy.spec.js
@@ -68,7 +68,7 @@ describe('ScrollSpy', () => {
fixtureEl.innerHTML = [
'<nav id="navigation" class="navbar">',
' <ul class="navbar-nav">',
- ' <li class="nav-item active"><a class="nav-link" id="one-link" href="#">One</a></li>',
+ ' <li class="nav-item"><a class="nav-link active" id="one-link" href="#">One</a></li>',
' <li class="nav-item"><a class="nav-link" id="two-link" href="#two">Two</a></li>',
' <li class="nav-item"><a class="nav-link" id="three-link" href="#three">Three</a></li>',
' </ul>',
@@ -177,7 +177,7 @@ describe('ScrollSpy', () => {
'<div id="header" style="height: 500px;"></div>',
'<nav id="navigation" class="navbar">',
' <ul class="navbar-nav">',
- ' <li class="nav-item active"><a class="nav-link" id="one-link" href="#one">One</a></li>',
+ ' <li class="nav-item"><a class="nav-link active" id="one-link" href="#one">One</a></li>',
' <li class="nav-item"><a class="nav-link" id="two-link" href="#two">Two</a></li>',
' <li class="nav-item"><a class="nav-link" id="three-link" href="#three">Three</a></li>',
' </ul>',
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index 374e46e1a..86d679c95 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -18,8 +18,8 @@
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav">
- <li class="nav-item active">
- <a class="nav-link" href="#" aria-current="page">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" href="#" aria-current="page">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index b39c4fd72..cb418622a 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -18,8 +18,8 @@
<div class="collapse navbar-expand-md" id="navbarResponsive">
<a class="navbar-brand" href="#">This shouldn't jump!</a>
<ul class="navbar-nav">
- <li class="nav-item active">
- <a class="nav-link" href="#" aria-current="page">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" href="#" aria-current="page">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/site/content/docs/5.0/examples/navbar-bottom/index.html b/site/content/docs/5.0/examples/navbar-bottom/index.html
index 8f4e2635c..aee772e20 100644
--- a/site/content/docs/5.0/examples/navbar-bottom/index.html
+++ b/site/content/docs/5.0/examples/navbar-bottom/index.html
@@ -18,8 +18,8 @@ title: Bottom navbar example
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/site/content/docs/5.0/examples/navbar-fixed/index.html b/site/content/docs/5.0/examples/navbar-fixed/index.html
index 9b09b713c..848137eff 100644
--- a/site/content/docs/5.0/examples/navbar-fixed/index.html
+++ b/site/content/docs/5.0/examples/navbar-fixed/index.html
@@ -13,8 +13,8 @@ extra_css:
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/site/content/docs/5.0/examples/navbar-static/index.html b/site/content/docs/5.0/examples/navbar-static/index.html
index 51010d7ed..fe95dab47 100644
--- a/site/content/docs/5.0/examples/navbar-static/index.html
+++ b/site/content/docs/5.0/examples/navbar-static/index.html
@@ -13,8 +13,8 @@ extra_css:
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/site/content/docs/5.0/examples/navbars/index.html b/site/content/docs/5.0/examples/navbars/index.html
index b4a29bdae..38281f3dd 100644
--- a/site/content/docs/5.0/examples/navbars/index.html
+++ b/site/content/docs/5.0/examples/navbars/index.html
@@ -15,8 +15,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample01">
<ul class="navbar-nav me-auto mb-2">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -49,8 +49,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample02">
<ul class="navbar-nav me-auto">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -72,8 +72,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample03">
<ul class="navbar-nav me-auto mb-2 mb-sm-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -106,8 +106,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample04">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -140,8 +140,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample05">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -174,8 +174,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample06">
<ul class="navbar-nav me-auto mb-2 mb-xl-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -208,8 +208,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExampleXxl">
<ul class="navbar-nav me-auto mb-2 mb-xl-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -242,8 +242,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample07">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -276,8 +276,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample07XL">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -313,8 +313,8 @@ extra_css:
<div class="collapse navbar-collapse justify-content-md-center" id="navbarsExample08">
<ul class="navbar-nav">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Centered nav only</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Centered nav only</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -345,8 +345,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExample09">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
@@ -378,8 +378,8 @@ extra_css:
<div class="collapse navbar-collapse justify-content-md-center" id="navbarsExample10">
<ul class="navbar-nav">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Centered nav only</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Centered nav only</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/site/content/docs/5.0/examples/offcanvas/index.html b/site/content/docs/5.0/examples/offcanvas/index.html
index cab0225ac..a7c99a538 100644
--- a/site/content/docs/5.0/examples/offcanvas/index.html
+++ b/site/content/docs/5.0/examples/offcanvas/index.html
@@ -17,8 +17,8 @@ body_class: "bg-light"
<div class="navbar-collapse offcanvas-collapse" id="navbarsExampleDefault">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Dashboard</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Dashboard</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Notifications</a>
diff --git a/site/content/docs/5.0/examples/starter-template/index.html b/site/content/docs/5.0/examples/starter-template/index.html
index ed2151447..0cd64c75f 100644
--- a/site/content/docs/5.0/examples/starter-template/index.html
+++ b/site/content/docs/5.0/examples/starter-template/index.html
@@ -14,8 +14,8 @@ extra_css:
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
diff --git a/site/content/docs/5.0/examples/sticky-footer-navbar/index.html b/site/content/docs/5.0/examples/sticky-footer-navbar/index.html
index 0b51fee5a..ce036dc09 100644
--- a/site/content/docs/5.0/examples/sticky-footer-navbar/index.html
+++ b/site/content/docs/5.0/examples/sticky-footer-navbar/index.html
@@ -17,8 +17,8 @@ body_class: "d-flex flex-column h-100"
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
- <li class="nav-item active">
- <a class="nav-link" aria-current="page" href="#">Home</a>
+ <li class="nav-item">
+ <a class="nav-link active" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>