diff options
| author | Mark Otto <[email protected]> | 2016-12-21 21:40:26 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-12-22 13:48:07 -0800 |
| commit | 80674b0c58e3fd8ce76ba94d1075d62c2db6af37 (patch) | |
| tree | 7d408d4f1d1980163bd9044d75be96c7f1a191ac /docs | |
| parent | ecba56828d5724f587f135e9dd32471b607f82aa (diff) | |
| download | bootstrap-80674b0c58e3fd8ce76ba94d1075d62c2db6af37.tar.xz bootstrap-80674b0c58e3fd8ce76ba94d1075d62c2db6af37.zip | |
fixes #18115: move forward with one naming scheme for inversed color schemes, renaming .navbar-dark to .navbar-inverse (matching .card-inverse in the process and restoring v3's inverted class name)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components/navbar.md | 12 | ||||
| -rw-r--r-- | docs/examples/album/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/jumbotron/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/justified-nav/justified-nav.css | 11 | ||||
| -rw-r--r-- | docs/examples/navbar-top-fixed/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/navbar-top/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/navbars/index.html | 6 | ||||
| -rw-r--r-- | docs/examples/offcanvas/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/starter-template/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/sticky-footer-navbar/index.html | 2 |
12 files changed, 28 insertions, 19 deletions
diff --git a/docs/components/navbar.md b/docs/components/navbar.md index 2b0b837be..7d0656d4b 100644 --- a/docs/components/navbar.md +++ b/docs/components/navbar.md @@ -265,10 +265,10 @@ Mix and match with other components and utilities as needed. ## Color schemes -Theming the navbar has never been easier thanks to the combination of theming classes and `background-color` utilities. Chose from `.navbar-light` for use with light background colors, or `.navbar-dark` for dark background colors. Then, customize with `.bg-*` utilities. +Theming the navbar has never been easier thanks to the combination of theming classes and `background-color` utilities. Chose from `.navbar-light` for use with light background colors, or `.navbar-inverse` for dark background colors. Then, customize with `.bg-*` utilities. <div class="bd-example"> - <nav class="navbar navbar-dark navbar-toggleable-md bg-inverse"> + <nav class="navbar navbar-inverse navbar-toggleable-md bg-inverse"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Navbar</a> @@ -294,7 +294,7 @@ Theming the navbar has never been easier thanks to the combination of theming cl </div> </nav> - <nav class="navbar navbar-dark navbar-toggleable-md bg-primary"> + <nav class="navbar navbar-inverse navbar-toggleable-md bg-primary"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Navbar</a> @@ -348,11 +348,11 @@ Theming the navbar has never been easier thanks to the combination of theming cl </div> {% highlight html %} -<nav class="navbar navbar-dark bg-inverse"> +<nav class="navbar navbar-inverse bg-inverse"> <!-- Navbar content --> </nav> -<nav class="navbar navbar-dark bg-primary"> +<nav class="navbar navbar-inverse bg-primary"> <!-- Navbar content --> </nav> @@ -478,7 +478,7 @@ Sometimes you want to use the collapse plugin to trigger hidden content elsewher <span class="text-muted">Toggleable via the navbar brand.</span> </div> </div> - <nav class="navbar navbar-dark bg-inverse"> + <nav class="navbar navbar-inverse bg-inverse"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggleExternalContent" aria-controls="navbarToggleExternalContent" aria-expanded="false" aria-label="Toggle navigation"></button> </nav> </div> diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html index 237c2e980..217ee5877 100644 --- a/docs/examples/album/index.html +++ b/docs/examples/album/index.html @@ -38,7 +38,7 @@ </div> </div> </div> - <div class="navbar navbar-dark bg-inverse navbar-toggleable-sm"> + <div class="navbar navbar-inverse bg-inverse navbar-toggleable-sm"> <div class="container flex-items-between"> <a href="#" class="navbar-brand">Album</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader" aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation"></button> diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index fbfe01531..f59123536 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -19,7 +19,7 @@ </head> <body> - <nav class="navbar navbar-dark navbar-fixed-top navbar-toggleable-md bg-inverse"> + <nav class="navbar navbar-inverse navbar-fixed-top navbar-toggleable-md bg-inverse"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Carousel</a> <div class="collapse navbar-collapse" id="navbarCollapse"> diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 9abbcf19d..96133e61a 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -19,7 +19,7 @@ </head> <body> - <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> + <nav class="navbar navbar-fixed-top navbar-inverse bg-inverse"> <button class="navbar-toggler hidden-md-up" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"></button> <div class="collapse navbar-toggleable-sm" id="navbar"> <a class="navbar-brand" href="#">Project name</a> diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index 27572dbfe..f926b71f3 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -20,7 +20,7 @@ <body> - <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> + <nav class="navbar navbar-fixed-top navbar-inverse bg-inverse"> <a class="navbar-brand" href="#">Project name</a> <ul class="nav navbar-nav"> <li class="nav-item active"> diff --git a/docs/examples/justified-nav/justified-nav.css b/docs/examples/justified-nav/justified-nav.css index fdec2a433..2f6de026e 100644 --- a/docs/examples/justified-nav/justified-nav.css +++ b/docs/examples/justified-nav/justified-nav.css @@ -20,17 +20,26 @@ body { } .navbar { + background-image: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7),to(#eee)); + background-image: -webkit-linear-gradient(top, #f7f7f7 0%,#eee 100%); + background-image: -o-linear-gradient(top, #f7f7f7 0%,#eee 100%); background-image: linear-gradient(to bottom, #f7f7f7 0%,#eee 100%); border: 1px solid #e5e5e5; } @media (min-width: 768px) { .navbar-nav { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; display: flex; } .navbar-nav .nav-item { - flex: 1 0 auto; + -webkit-box-flex: 1; + -webkit-flex: 1 0 auto; + -ms-flex: 1 0 auto; + flex: 1 0 auto; } } diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html index 6f2964720..c38aaef1b 100644 --- a/docs/examples/navbar-top-fixed/index.html +++ b/docs/examples/navbar-top-fixed/index.html @@ -20,7 +20,7 @@ <body> - <nav class="navbar navbar-dark navbar-fixed-top navbar-toggleable-md bg-inverse"> + <nav class="navbar navbar-inverse navbar-fixed-top navbar-toggleable-md bg-inverse"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Fixed navbar</a> <div class="collapse navbar-collapse" id="navbarCollapse"> diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html index e68552385..04c03ac21 100644 --- a/docs/examples/navbar-top/index.html +++ b/docs/examples/navbar-top/index.html @@ -20,7 +20,7 @@ <body> - <nav class="navbar navbar-dark navbar-toggleable-md bg-inverse mb-3"> + <nav class="navbar navbar-inverse navbar-toggleable-md bg-inverse mb-3"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Fixed navbar</a> <div class="collapse navbar-collapse" id="navbarCollapse"> diff --git a/docs/examples/navbars/index.html b/docs/examples/navbars/index.html index fcef38de2..934c2cd03 100644 --- a/docs/examples/navbars/index.html +++ b/docs/examples/navbars/index.html @@ -20,7 +20,7 @@ <body> - <nav class="navbar navbar-dark bg-inverse"> + <nav class="navbar navbar-inverse bg-inverse"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Navbar</a> @@ -51,7 +51,7 @@ </div> </nav> - <nav class="navbar navbar-dark bg-inverse"> + <nav class="navbar navbar-inverse bg-inverse"> <div class="container"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleContainer" aria-controls="navbarsExampleContainer" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Container</a> @@ -84,7 +84,7 @@ </div> </nav> - <nav class="navbar navbar-dark bg-inverse"> + <nav class="navbar navbar-inverse bg-inverse"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleCenteredNav" aria-controls="navbarsExampleCenteredNav" aria-expanded="false" aria-label="Toggle navigation"></button> <div class="collapse navbar-toggleable-md" id="navbarsExampleCenteredNav"> diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index f43e0e5d5..53f2db160 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -19,7 +19,7 @@ </head> <body> - <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> + <nav class="navbar navbar-fixed-top navbar-inverse bg-inverse"> <div class="container"> <a class="navbar-brand" href="#">Project name</a> <ul class="nav navbar-nav"> diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index cb45245aa..fe6dfc069 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -20,7 +20,7 @@ <body> - <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> + <nav class="navbar navbar-fixed-top navbar-inverse bg-inverse"> <a class="navbar-brand" href="#">Project name</a> <ul class="nav navbar-nav"> <li class="nav-item active"> diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index a78be094d..bc2708a50 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -21,7 +21,7 @@ <body> <!-- Fixed navbar --> - <nav class="navbar navbar-dark navbar-fixed-top navbar-toggleable-md bg-inverse"> + <nav class="navbar navbar-inverse navbar-fixed-top navbar-toggleable-md bg-inverse"> <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Fixed navbar</a> <div class="collapse navbar-collapse" id="navbarCollapse"> |
