Skip to content

B
bootstrap
Commit 715e9242 authored by Chris Rebert's avatar Chris Rebert
Browse files
Options

Merge pull request #9399 from twbs/make-docs-html-more-valid 

Make docs HTML more valid
parents 4876a3a7 f4bb6609
Expand all Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 74 deletions
_includes/social-buttons.html
View file @ 715e9242
<div class="bs-social"> <div class="bs-social">
<ul class="bs-social-buttons"> <ul class="bs-social-buttons">
<li> <li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20" title="Star on GitHub"></iframe> <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
</li> </li>
<li> <li>
<iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102" height="20" title="Fork on GitHub"></iframe> <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" width="102" height="20" title="Fork on GitHub"></iframe>
</li> </li>
<li class="follow-btn"> <li class="follow-btn">
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
......
assets/css/docs.css
View file @ 715e9242
...@@ -414,17 +414,15 @@ body { ...@@ -414,17 +414,15 @@ body {
} }
/* Typography */ /* Typography */
.bs-example-type .table td { .bs-example-type .table td:last-child {
color: #999; color: #999;
vertical-align: middle; vertical-align: middle;
} }
.bs-example-type .table td, .bs-example-type .table td {
.bs-example-type .table th {
padding: 15px 0; padding: 15px 0;
border-color: #eee; border-color: #eee;
} }
.bs-example-type .table tr:first-child td, .bs-example-type .table tr:first-child td {
.bs-example-type .table tr:first-child th {
border-top: 0; border-top: 0;
} }
.bs-example-type h1, .bs-example-type h1,
...@@ -707,6 +705,11 @@ body { ...@@ -707,6 +705,11 @@ body {
.bs-social-buttons .twitter-share-button { .bs-social-buttons .twitter-share-button {
width: 98px !important; width: 98px !important;
} }
/* Style the GitHub buttons via CSS instead of inline attributes */
.github-btn {
border: 0;
overflow: hidden;
}
......
components.html
View file @ 715e9242
...@@ -1124,7 +1124,7 @@ base_url: "../" ...@@ -1124,7 +1124,7 @@ base_url: "../"
<nav class="navbar" role="navigation"> <nav class="navbar" role="navigation">
<form class="navbar-form pull-left" role="form"> <form class="navbar-form pull-left" role="form">
<select name="" id="" class="form-control" style="width: 200px;"> <select name="" class="form-control" style="width: 200px;">
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
<option value="3">3</option> <option value="3">3</option>
...@@ -1318,7 +1318,7 @@ body { padding-bottom: 70px; } ...@@ -1318,7 +1318,7 @@ body { padding-bottom: 70px; }
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form pull-left" action="" role="search"> <form class="navbar-form pull-left" action="." role="search">
<input type="text" class="form-control col-lg-8" placeholder="Search"> <input type="text" class="form-control col-lg-8" placeholder="Search">
</form> </form>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
...@@ -1388,7 +1388,7 @@ body { padding-bottom: 70px; } ...@@ -1388,7 +1388,7 @@ body { padding-bottom: 70px; }
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
</ul> </ul>
<form class="navbar-form pull-left" action="" role="search"> <form class="navbar-form pull-left" action="." role="search">
<input type="text" class="form-control col-lg-8" placeholder="Search"> <input type="text" class="form-control col-lg-8" placeholder="Search">
</form> </form>
</div><!-- /.nav-collapse --> </div><!-- /.nav-collapse -->
...@@ -1438,7 +1438,7 @@ body { padding-bottom: 70px; } ...@@ -1438,7 +1438,7 @@ body { padding-bottom: 70px; }
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form pull-left" action="" role="search"> <form class="navbar-form pull-left" action="." role="search">
<input type="text" class="form-control col-lg-8" placeholder="Search"> <input type="text" class="form-control col-lg-8" placeholder="Search">
</form> </form>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
...@@ -1819,22 +1819,22 @@ body { padding-bottom: 70px; } ...@@ -1819,22 +1819,22 @@ body { padding-bottom: 70px; }
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt=""> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt=""> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt=""> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt=""> <img data-src="holder.js/100%x180" alt="Generic placeholder thumbnail">
</a> </a>
</div> </div>
</div> </div>
...@@ -1843,7 +1843,7 @@ body { padding-bottom: 70px; } ...@@ -1843,7 +1843,7 @@ body { padding-bottom: 70px; }
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="thumbnail"> <a href="#" class="thumbnail">
<img data-src="holder.js/100%x180" alt=""> <img data-src="holder.js/100%x180" alt="...">
</a> </a>
</div> </div>
... ...
...@@ -2148,7 +2148,7 @@ body { padding-bottom: 70px; } ...@@ -2148,7 +2148,7 @@ body { padding-bottom: 70px; }
<div class="bs-example"> <div class="bs-example">
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2157,14 +2157,14 @@ body { padding-bottom: 70px; } ...@@ -2157,14 +2157,14 @@ body { padding-bottom: 70px; }
</div> </div>
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2177,7 +2177,7 @@ body { padding-bottom: 70px; } ...@@ -2177,7 +2177,7 @@ body { padding-bottom: 70px; }
{% highlight html %} {% highlight html %}
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" src="..."> <img class="media-object" src="..." alt="...">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2192,7 +2192,7 @@ body { padding-bottom: 70px; } ...@@ -2192,7 +2192,7 @@ body { padding-bottom: 70px; }
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2200,7 +2200,7 @@ body { padding-bottom: 70px; } ...@@ -2200,7 +2200,7 @@ body { padding-bottom: 70px; }
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -2208,7 +2208,7 @@ body { padding-bottom: 70px; } ...@@ -2208,7 +2208,7 @@ body { padding-bottom: 70px; }
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -2220,7 +2220,7 @@ body { padding-bottom: 70px; } ...@@ -2220,7 +2220,7 @@ body { padding-bottom: 70px; }
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -2231,7 +2231,7 @@ body { padding-bottom: 70px; } ...@@ -2231,7 +2231,7 @@ body { padding-bottom: 70px; }
</li> </li>
<li class="media"> <li class="media">
<a class="pull-right" href="#"> <a class="pull-right" href="#">
<img class="media-object" data-src="holder.js/64x64"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -2244,7 +2244,7 @@ body { padding-bottom: 70px; } ...@@ -2244,7 +2244,7 @@ body { padding-bottom: 70px; }
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="pull-left" href="#"> <a class="pull-left" href="#">
<img class="media-object" src="..."> <img class="media-object" src="..." alt="...">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
......
css.html
View file @ 715e9242
This diff is collapsed.
javascript.html
View file @ 715e9242
...@@ -1613,13 +1613,13 @@ $('#myCollapsible').on('hidden.bs.collapse', function () { ...@@ -1613,13 +1613,13 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</ol> </ol>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item active"> <div class="item active">
<img data-src="holder.js/900x500/auto/#777:#555/text:First slide" alt=""> <img data-src="holder.js/900x500/auto/#777:#555/text:First slide" alt="First slide">
</div> </div>
<div class="item"> <div class="item">
<img data-src="holder.js/900x500/auto/#666:#444/text:Second slide" alt=""> <img data-src="holder.js/900x500/auto/#666:#444/text:Second slide" alt="Second slide">
</div> </div>
<div class="item"> <div class="item">
<img data-src="holder.js/900x500/auto/#555:#333/text:Third slide" alt=""> <img data-src="holder.js/900x500/auto/#555:#333/text:Third slide" alt="Third slide">
</div> </div>
</div> </div>
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev"> <a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
...@@ -1642,7 +1642,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () { ...@@ -1642,7 +1642,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<!-- Wrapper for slides --> <!-- Wrapper for slides -->
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item active"> <div class="item active">
<img src="..." alt=""> <img src="..." alt="...">
<div class="carousel-caption"> <div class="carousel-caption">
... ...
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment