Skip to content

B
bootstrap
Commit 80eb09cc authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' into bs3_navbar_overhaul 

Conflicts:
	components.html
	dist/css/bootstrap.min.css
parents 8bb7def2 49576704
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 80 deletions
_includes/social-buttons.html
View file @ 80eb09cc
<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 @ 80eb09cc
...@@ -416,17 +416,15 @@ body { ...@@ -416,17 +416,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,
...@@ -709,6 +707,11 @@ body { ...@@ -709,6 +707,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 @ 80eb09cc
...@@ -1168,6 +1168,7 @@ base_url: "../" ...@@ -1168,6 +1168,7 @@ base_url: "../"
<p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p> <p>Be sure to add a <code>role="navigation"</code> to every navbar to help with accessibility.</p>
</div> </div>
<h2 id="navbar-optional-content">Optional navbar content</h2> <h2 id="navbar-optional-content">Optional navbar content</h2>
<p>Quickly add other types of content, beyond links or forms, to a navbar with a few classes.</p> <p>Quickly add other types of content, beyond links or forms, to a navbar with a few classes.</p>
...@@ -1742,22 +1743,22 @@ body { padding-bottom: 70px; } ...@@ -1742,22 +1743,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>
...@@ -1766,7 +1767,7 @@ body { padding-bottom: 70px; } ...@@ -1766,7 +1767,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>
... ...
...@@ -2071,7 +2072,7 @@ body { padding-bottom: 70px; } ...@@ -2071,7 +2072,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>
...@@ -2080,14 +2081,14 @@ body { padding-bottom: 70px; } ...@@ -2080,14 +2081,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>
...@@ -2100,7 +2101,7 @@ body { padding-bottom: 70px; } ...@@ -2100,7 +2101,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>
...@@ -2115,7 +2116,7 @@ body { padding-bottom: 70px; } ...@@ -2115,7 +2116,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>
...@@ -2123,7 +2124,7 @@ body { padding-bottom: 70px; } ...@@ -2123,7 +2124,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>
...@@ -2131,7 +2132,7 @@ body { padding-bottom: 70px; } ...@@ -2131,7 +2132,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>
...@@ -2143,7 +2144,7 @@ body { padding-bottom: 70px; } ...@@ -2143,7 +2144,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>
...@@ -2154,7 +2155,7 @@ body { padding-bottom: 70px; } ...@@ -2154,7 +2155,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>
...@@ -2167,7 +2168,7 @@ body { padding-bottom: 70px; } ...@@ -2167,7 +2168,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 @ 80eb09cc
This diff is collapsed.
dist/css/bootstrap.css
View file @ 80eb09cc
...@@ -286,7 +286,9 @@ table { ...@@ -286,7 +286,9 @@ table {
} }
} }
* { *,
*:before,
*:after {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -2253,7 +2255,8 @@ input[type="button"].btn-block { ...@@ -2253,7 +2255,8 @@ input[type="button"].btn-block {
} }
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon { .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 45px; height: 45px;
padding: 10px 16px; padding: 10px 16px;
font-size: 18px; font-size: 18px;
...@@ -2262,7 +2265,8 @@ input[type="button"].btn-block { ...@@ -2262,7 +2265,8 @@ input[type="button"].btn-block {
} }
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon { .input-group-sm > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
......
dist/css/bootstrap.min.css
View file @ 80eb09cc
This source diff could not be displayed because it is too large. You can view the blob instead.
javascript.html
View file @ 80eb09cc
...@@ -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>
......
less/input-groups.less
View file @ 80eb09cc
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
// manipulation. // manipulation.
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon { .input-lg(); } .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-lg(); }
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon { .input-sm(); } .input-group-sm > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-sm(); }
// Display as table-cell // Display as table-cell
......
less/scaffolding.less
View file @ 80eb09cc
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
// Reset the box-sizing // Reset the box-sizing
// ------------------------- // -------------------------
* { *,
*:before,
*:after {
.box-sizing(border-box); .box-sizing(border-box);
} }
......
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