diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:47:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:47:29 -0700 |
| commit | c240460f0b38ab2a2bc4f542695a4ca4e1748487 (patch) | |
| tree | 35641cecac7a46779c1c996ffcc5048a14700740 /examples | |
| parent | fa7cc6cafda4f5a9363d17507bf91cba22777749 (diff) | |
| parent | 638db635d7b0c2bd6406d5ff891e92985e4b839b (diff) | |
| download | bootstrap-c240460f0b38ab2a2bc4f542695a4ca4e1748487.tar.xz bootstrap-c240460f0b38ab2a2bc4f542695a4ca4e1748487.zip | |
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/jumbotron/index.html | 2 | ||||
| -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 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index fcf7174c4..86255fca3 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -59,7 +59,7 @@ <div class="form-group"> <input type="password" placeholder="Password" class="form-control"> </div> - <button type="submit" class="btn">Sign in</button> + <button type="submit" class="btn btn-success">Sign in</button> </form> </div><!--/.navbar-collapse --> </div> 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"> |