diff options
| author | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 00:26:53 -0800 |
| commit | bb4a39d51cd644b212323a7e36f0b5af2682d0ca (patch) | |
| tree | 60ae6687f516cea501f32f5623a5c0aacb950772 /examples | |
| parent | 96109d3138fd6f5b67fb1108754e81c077630b36 (diff) | |
| parent | e6eb798178529cf58fab3f33446c0170bae7bdea (diff) | |
| download | bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.tar.xz bootstrap-bb4a39d51cd644b212323a7e36f0b5af2682d0ca.zip | |
Merge branch 'master' into pr/11388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/jumbotron/index.html | 2 | ||||
| -rw-r--r-- | examples/justified-nav/index.html | 3 | ||||
| -rw-r--r-- | examples/signin/index.html | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index 3e301a104..b7ff7f76c 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -40,7 +40,7 @@ <a class="navbar-brand" href="#">Project name</a> </div> <div class="navbar-collapse collapse"> - <form class="navbar-form navbar-right"> + <form class="navbar-form navbar-right" role="form"> <div class="form-group"> <input type="text" placeholder="Email" class="form-control"> </div> diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index c2cf0ca13..9c36f6647 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -52,7 +52,8 @@ <!-- Example row of columns --> <div class="row"> <div class="col-lg-4"> - <h2>Heading</h2> + <h2>Safari bug warning!</h2> + <p class="text-danger">Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.</p> <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p> <p><a class="btn btn-primary" href="#" role="button">View details »</a></p> </div> diff --git a/examples/signin/index.html b/examples/signin/index.html index 72110751f..2f6e37020 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -30,7 +30,7 @@ <div class="container"> - <form class="form-signin"> + <form class="form-signin" role="form"> <h2 class="form-signin-heading">Please sign in</h2> <input type="text" class="form-control" placeholder="Email address" required autofocus> <input type="password" class="form-control" placeholder="Password" required> |