diff options
| author | Mark Otto <[email protected]> | 2016-10-09 14:36:43 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-09 14:36:43 -0700 |
| commit | 6c867667a19dcb1243153855d00e36e5ecd599d0 (patch) | |
| tree | 83906930225ae824a4538fba44fe534e048129c6 /docs/examples | |
| parent | 88bf5af896a872d65752956e85adb66a9192e697 (diff) | |
| parent | f49a7a2a0830ced28c5dbd8f94e04ad2f9d7425d (diff) | |
| download | bootstrap-6c867667a19dcb1243153855d00e36e5ecd599d0.tar.xz bootstrap-6c867667a19dcb1243153855d00e36e5ecd599d0.zip | |
Merge branch 'v4-dev' into v4-utils
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/album/index.html | 4 | ||||
| -rw-r--r-- | docs/examples/blog/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/cover/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 7 | ||||
| -rw-r--r-- | docs/examples/grid/index.html | 2 | ||||
| -rw-r--r-- | docs/examples/index.md | 14 | ||||
| -rw-r--r-- | docs/examples/navbar-top-fixed/index.html | 6 | ||||
| -rw-r--r-- | docs/examples/navbar-top/index.html | 6 | ||||
| -rw-r--r-- | docs/examples/navbar/index.html | 6 | ||||
| -rw-r--r-- | docs/examples/sticky-footer-navbar/index.html | 4 |
10 files changed, 19 insertions, 34 deletions
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html index 308810300..11d99c259 100644 --- a/docs/examples/album/index.html +++ b/docs/examples/album/index.html @@ -37,9 +37,7 @@ </div> <div class="navbar navbar-static-top navbar-dark bg-inverse"> <div class="container-fluid"> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header"> - ☰ - </button> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> <a href="#" class="navbar-brand">Album</a> </div> </div> diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index bfbb955b5..e4ef18ddc 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -148,7 +148,7 @@ </div><!-- /.container --> <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>Blog template built for <a href="https://getbootstrap.com">Bootstrap</a> by <a href="https://twitter.com/mdo">@mdo</a>.</p> <p> <a href="#">Back to top</a> </p> diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index 930e10bf8..9518792dd 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/index.html @@ -47,7 +47,7 @@ <div class="mastfoot"> <div class="inner"> - <p>Cover template for <a href="http://getbootstrap.com">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p> + <p>Cover template for <a href="https://getbootstrap.com">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p> </div> </div> diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index d0cceb7d7..1670e8557 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -21,12 +21,7 @@ <body> <nav class="navbar navbar-dark navbar-fixed-top bg-inverse"> - <button type="button" class="navbar-toggler hidden-sm-up" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> + <button type="button" class="navbar-toggler hidden-sm-up" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" aria-label="Toggle navigation"></button> <a class="navbar-brand" href="#">Project name</a> <div id="navbar"> <nav class="nav navbar-nav float-xs-left"> diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index 33140b1e1..02df70804 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -135,7 +135,7 @@ <hr> <h3>Column clearing</h3> - <p><a href="http://getbootstrap.com/css/#grid-responsive-resets">Clear floats</a> at specific breakpoints to prevent awkward wrapping with uneven content.</p> + <p><a href="https://getbootstrap.com/css/#grid-responsive-resets">Clear floats</a> at specific breakpoints to prevent awkward wrapping with uneven content.</p> <div class="row"> <div class="col-xs-6 col-sm-3"> .col-xs-6 .col-sm-3 diff --git a/docs/examples/index.md b/docs/examples/index.md index 500799f3a..49e43793a 100644 --- a/docs/examples/index.md +++ b/docs/examples/index.md @@ -24,7 +24,7 @@ Examples that focus on implementing uses of built-in components provided by Boot <h4>Grids</h4> <p>Multiple examples of grid layouts with all four tiers, nesting, and more.</p> </div> - <div class="clearfix hidden-sm-up"></div> + <div class="clearfix hidden-md-up"></div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/jumbotron/"> @@ -61,7 +61,7 @@ Taking the default navbar component and showing how it can be moved, placed, and <h4>Static top navbar</h4> <p>Super basic template with a static top navbar along with some additional content.</p> </div> - <div class="clearfix hidden-sm-up"></div> + <div class="clearfix hidden-md-up"></div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/navbar-top-fixed/"> @@ -91,7 +91,7 @@ Brand new components and templates to help folks quickly get started with Bootst <h4>Cover</h4> <p>A one-page template for building simple and beautiful home pages.</p> </div> - <div class="clearfix hidden-sm-up"></div> + <div class="clearfix hidden-md-up"></div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/carousel/"> @@ -107,7 +107,7 @@ Brand new components and templates to help folks quickly get started with Bootst <h4>Blog</h4> <p>Simple two-column blog layout with custom navigation, header, and type.</p> </div> - <div class="clearfix hidden-sm-up"></div> + <div class="clearfix hidden-md-up"></div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/dashboard/"> @@ -123,14 +123,14 @@ Brand new components and templates to help folks quickly get started with Bootst <h4>Sign-in page</h4> <p>Custom form layout and design for a simple sign in form.</p> </div> - <div class="clearfix hidden-sm-up"></div> + <div class="clearfix hidden-md-up"></div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/justified-nav/"> <img class="img-thumbnail" src="{{ site.baseurl }}/examples/screenshots/justified-nav.jpg" alt=""> </a> <h4>Justified nav</h4> - <p>Create a custom navbar with justified links. Heads up! <a href="{{ site.baseurl }}components/#nav-justified">Not too Safari friendly.</a></p> + <p>Create a custom navbar with justified links. Heads up! Not too Safari friendly.</p> </div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/sticky-footer/"> @@ -139,7 +139,7 @@ Brand new components and templates to help folks quickly get started with Bootst <h4>Sticky footer</h4> <p>Attach a footer to the bottom of the viewport when the content is shorter than it.</p> </div> - <div class="clearfix hidden-sm-up"></div> + <div class="clearfix hidden-md-up"></div> <div class="col-xs-6 col-md-4"> <a href="{{ site.baseurl }}/examples/sticky-footer-navbar/"> diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html index bda85c409..45514d854 100644 --- a/docs/examples/navbar-top-fixed/index.html +++ b/docs/examples/navbar-top-fixed/index.html @@ -27,9 +27,7 @@ </div> </div> <div class="navbar navbar-light bg-faded navbar-static-top"> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header"> - ☰ - </button> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> </div> </div> @@ -37,7 +35,7 @@ <div class="jumbotron"> <h1>Navbar example</h1> <p class="lead">This example is a quick exercise to illustrate how fixed to top navbar works. As you scroll, it will remain fixed to the top of your browser's viewport.</p> - <a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs »</a> + <a class="btn btn-lg btn-primary" href="../../components/navbar/" role="button">View navbar docs »</a> </div> </div> diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html index 52c61098f..66e7754ad 100644 --- a/docs/examples/navbar-top/index.html +++ b/docs/examples/navbar-top/index.html @@ -26,16 +26,14 @@ </div> </div> <div class="navbar navbar-light bg-faded navbar-static-top m-b-1"> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header"> - ☰ - </button> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> </div> <div class="container"> <div class="jumbotron"> <h1>Navbar example</h1> <p class="lead">This example is a quick exercise to illustrate how the top-aligned navbar works. As you scroll, this navbar remains in its original position and moves with the rest of the page.</p> - <a class="btn btn-lg btn-primary" href="../../components/#navbar" role="button">View navbar docs »</a> + <a class="btn btn-lg btn-primary" href="../../components/navbar/" role="button">View navbar docs »</a> </div> </div> diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index b5dff3380..f04d18748 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -22,9 +22,7 @@ <div class="container"> <nav class="navbar navbar-light bg-faded"> - <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header"> - ☰ - </button> + <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> <div class="collapse navbar-toggleable-xs" id="navbar-header"> <a class="navbar-brand" href="#">Navbar</a> <ul class="nav navbar-nav"> @@ -54,7 +52,7 @@ <p>This example is a quick exercise to illustrate how the default responsive navbar works. It's placed within a <code>.container</code> to limit its width and will scroll with the rest of the page's content.</p> <p>At the smallest breakpoint, the collapse plugin is used to hide the links and show a menu button to toggle the collapsed content.</p> <p> - <a class="btn btn-lg btn-primary" href="../../components/navbar" role="button">View navbar docs »</a> + <a class="btn btn-lg btn-primary" href="../../components/navbar/" role="button">View navbar docs »</a> </p> </div> diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index aa8b8c5c8..efe9b4c64 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -30,9 +30,7 @@ </div> <nav class="navbar navbar-light navbar-static-top bg-faded"> <div class="container"> - <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2"> - ☰ - </button> + <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-expanded="false" aria-controls="exCollapsingNavbar2" aria-label="Toggle navigation"></button> <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2"> <a class="navbar-brand" href="#">Sticky footer</a> <ul class="nav navbar-nav"> |
