diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /docs/examples/album/index.html | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'docs/examples/album/index.html')
| -rw-r--r-- | docs/examples/album/index.html | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html index ac456377b..bfc9d0223 100644 --- a/docs/examples/album/index.html +++ b/docs/examples/album/index.html @@ -15,9 +15,6 @@ <!-- Custom styles for this template --> <link href="album.css" rel="stylesheet"> - - <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> - <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> </head> <body> @@ -38,7 +35,7 @@ </div> </div> </div> - <div class="navbar navbar-inverse navbar-static-top"> + <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"> ☰ @@ -63,41 +60,41 @@ <div class="row"> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> <div class="card"> - <img data-src="holder.js/100%x280/thumb" alt="Card image cap"> + <img data-src="holder.js/100px280/thumb" alt="Card image cap"> <p class="card-text">This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p> </div> </div> @@ -118,13 +115,16 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> - <script src="../../assets/js/vendor/holder.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> + <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script> + <script src="../../assets/js/vendor/holder.min.js"></script> <script> $(function () { Holder.addTheme("thumb", { background: "#55595c", foreground: "#eceeef", text: "Thumbnail" }); }); </script> <script src="../../dist/js/bootstrap.min.js"></script> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> </body> </html> |