diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:43:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:43:27 -0700 |
| commit | 7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa (patch) | |
| tree | 55e084b792818900f4db658e60d8ff699e80c4ad /examples | |
| parent | fe767a18d369080df509377e049b616c0c572dcc (diff) | |
| parent | ef68cf8ebdabccfa4bb9126acdc79f0510b04537 (diff) | |
| download | bootstrap-7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa.tar.xz bootstrap-7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa.zip | |
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/navbar-fixed-top/index.html | 2 | ||||
| -rw-r--r-- | examples/navbar-static-top/index.html | 2 | ||||
| -rw-r--r-- | examples/navbar/index.html | 2 | ||||
| -rw-r--r-- | examples/sticky-footer-navbar/index.html | 2 | ||||
| -rw-r--r-- | examples/theme/index.html | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index 3ed3cf0f5..90f984e96 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -25,7 +25,7 @@ <body> <!-- Fixed navbar --> - <div class="navbar navbar-fixed-top"> + <div class="navbar navbar-default navbar-fixed-top"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index a366a895a..98ec31d6a 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -25,7 +25,7 @@ <body> <!-- Static navbar --> - <div class="navbar navbar-static-top"> + <div class="navbar navbar-default navbar-static-top"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> diff --git a/examples/navbar/index.html b/examples/navbar/index.html index 75a996c15..97e4c0c8c 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -27,7 +27,7 @@ <div class="container"> <!-- Static navbar --> - <div class="navbar"> + <div class="navbar navbar-default"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index 92f166d04..551212a80 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -28,7 +28,7 @@ <div id="wrap"> <!-- Fixed navbar --> - <div class="navbar navbar-fixed-top"> + <div class="navbar navbar-default navbar-fixed-top"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> diff --git a/examples/theme/index.html b/examples/theme/index.html index 9569d9e82..a44a8220a 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -140,7 +140,7 @@ <h1>Navbars</h1> </div> - <div class="navbar"> + <div class="navbar navbar-default"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> |