diff options
| author | Mark Otto <[email protected]> | 2014-11-09 22:02:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-11-09 22:02:53 -0800 |
| commit | 86af1f39abbff7ef06b94d23951408ca27f81cdc (patch) | |
| tree | fdd71d469877a0fdfcaa8ab3d6994463240c40c4 /docs/examples | |
| parent | 9796f56fa175c41582793a87a1c7eab0f8db1209 (diff) | |
| parent | d1278efcc5a6b45467caca15206bb1a83ae99fc5 (diff) | |
| download | bootstrap-86af1f39abbff7ef06b94d23951408ca27f81cdc.tar.xz bootstrap-86af1f39abbff7ef06b94d23951408ca27f81cdc.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/blog/index.html | 4 | ||||
| -rw-r--r-- | docs/examples/jumbotron-narrow/index.html | 4 | ||||
| -rw-r--r-- | docs/examples/jumbotron/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/justified-nav/index.html | 6 | ||||
| -rw-r--r-- | docs/examples/sticky-footer-navbar/index.html | 4 | ||||
| -rw-r--r-- | docs/examples/sticky-footer/index.html | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index 59dcd5e2d..9e2d1b7e7 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -149,12 +149,12 @@ </div><!-- /.container --> - <div class="blog-footer"> + <footer class="blog-footer"> <p>Blog template built for <a href="http://getbootstrap.com">Bootstrap</a> by <a href="https://twitter.com/mdo">@mdo</a>.</p> <p> <a href="#">Back to top</a> </p> - </div> + </footer> <!-- Bootstrap core JavaScript diff --git a/docs/examples/jumbotron-narrow/index.html b/docs/examples/jumbotron-narrow/index.html index 637f6d9ff..04571e1b2 100644 --- a/docs/examples/jumbotron-narrow/index.html +++ b/docs/examples/jumbotron-narrow/index.html @@ -62,9 +62,9 @@ </div> </div> - <div class="footer"> + <footer class="footer"> <p>© Company 2014</p> - </div> + </footer> </div> <!-- /container --> diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index 950f82d9d..be40ece64 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -52,7 +52,7 @@ <div class="container"> <h1>Hello, world!</h1> <p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p> - <p><a class="btn btn-primary btn-lg" role="button">Learn more »</a></p> + <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more »</a></p> </div> </div> diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html index c1f7a8a0c..d15032eef 100644 --- a/docs/examples/justified-nav/index.html +++ b/docs/examples/justified-nav/index.html @@ -47,7 +47,7 @@ <div class="row"> <div class="col-lg-4"> <h2>Safari bug warning!</h2> - <p class="text-danger">As of v7.0.1, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing.</p> + <p class="text-danger">As of v8.0, 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> @@ -64,9 +64,9 @@ </div> <!-- Site footer --> - <div class="footer"> + <footer class="footer"> <p>© Company 2014</p> - </div> + </footer> </div> <!-- /container --> diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 83546750c..b7fd75d3d 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -65,11 +65,11 @@ <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p> </div> - <div class="footer"> + <footer class="footer"> <div class="container"> <p class="text-muted">Place sticky footer content here.</p> </div> - </div> + </footer> <!-- Bootstrap core JavaScript diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html index c79adde99..538a33a69 100644 --- a/docs/examples/sticky-footer/index.html +++ b/docs/examples/sticky-footer/index.html @@ -31,11 +31,11 @@ <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p> </div> - <div class="footer"> + <footer class="footer"> <div class="container"> <p class="text-muted">Place sticky footer content here.</p> </div> - </div> + </footer> <!-- Bootstrap core JavaScript |
