rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	dist/js/bootstrap.min.js
This commit is contained in:
Jacob Thornton 2013-07-23 22:59:33 -07:00
commit 3cfa1c8a30
5 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -89,7 +89,7 @@ Editor preferences are available in the [editor config](.editorconfig) for easy
Keep track of development and community news.
* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
* Read and subscribe to the [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com).
* Read and subscribe to the [The Official Bootstrap Blog](http://blog.getbootstrap.com).
* Have a question that's not a feature request or bug report? [Ask on the mailing list.](http://groups.google.com/group/twitter-bootstrap)
* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.

32
dist/css/bootstrap.css vendored
View File

@ -1191,29 +1191,53 @@ table th[class^="col-"] {
float: none;
}
.table > thead > tr > td.active,
.table > tbody > tr > td.active,
.table > tfoot > tr > td.active,
.table > thead > tr > th.active,
.table > tbody > tr > th.active,
.table > tbody > tr.active > td {
.table > tfoot > tr > th.active,
.table > thead > tr.active > td,
.table > tbody > tr.active > td,
.table > tfoot > tr.active > td {
background-color: #f5f5f5;
}
.table > thead > tr > td.success,
.table > tbody > tr > td.success,
.table > tfoot > tr > td.success,
.table > thead > tr > th.success,
.table > tbody > tr > th.success,
.table > tbody > tr.success > td {
.table > tfoot > tr > th.success,
.table > thead > tr.success > td,
.table > tbody > tr.success > td,
.table > tfoot > tr.success > td {
background-color: #dff0d8;
border-color: #d6e9c6;
}
.table > thead > tr > td.danger,
.table > tbody > tr > td.danger,
.table > tfoot > tr > td.danger,
.table > thead > tr > th.danger,
.table > tbody > tr > th.danger,
.table > tbody > tr.danger > td {
.table > tfoot > tr > th.danger,
.table > thead > tr.danger > td,
.table > tbody > tr.danger > td,
.table > tfoot > tr.danger > td {
background-color: #f2dede;
border-color: #eed3d7;
}
.table > thead > tr > td.warning,
.table > tbody > tr > td.warning,
.table > tfoot > tr > td.warning,
.table > thead > tr > th.warning,
.table > tbody > tr > th.warning,
.table > tbody > tr.warning > td {
.table > tfoot > tr > th.warning,
.table > thead > tr.warning > td,
.table > tbody > tr.warning > td,
.table > tfoot > tr.warning > td {
background-color: #fcf8e3;
border-color: #fbeed5;
}

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
getting-started.html
View File

@ -161,20 +161,20 @@ bootstrap/
<div class="page-header">
<h1>License FAQs</h1>
</div>
<p class="lead">Bootstrap is released under the Apache 2 license. Boiled down to smaller chunks, it can be described with the following conditions.</p>
<p class="lead">Bootstrap is released under the Apache 2 license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.</p>
<div class="row">
<div class="col-12 col-lg-6">
<h4>It allows you to:</h4>
<ul>
<li>Freely download and use Twitter open source software, in whole or in part, for personal, company internal or commercial purposes</li>
<li>Use Twitter open source software in packages or distributions that you create</li>
<li>Freely download and use Bootstrap, in whole or in part, for personal, company internal or commercial purposes</li>
<li>Use Bootstrap in packages or distributions that you create</li>
</ul>
</div>
<div class="col-12 col-lg-6">
<h4>It forbids you to:</h4>
<ul>
<li>Redistribute any piece of Twitter open source originated software without proper attribution</li>
<li>Redistribute any piece of Bootstrap without proper attribution</li>
<li>Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution</li>
<li>Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question</li>
</ul>
@ -184,15 +184,15 @@ bootstrap/
<div class="col-12 col-lg-6">
<h4>It requires you to:</h4>
<ul>
<li>Include a copy of the license in any redistribution you may make that includes Twitter software</li>
<li>Provide clear attribution to Twitter for any distributions that include Twitter open source software</li>
<li>Include a copy of the license in any redistribution you may make that includes Bootstrap</li>
<li>Provide clear attribution to Twitter for any distributions that include Bootstrap</li>
</ul>
</div>
<div class="col-12 col-lg-6">
<h4>It does not require you to:</h4>
<ul>
<li>Include the source of the Twitter software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it</li>
<li>Submit changes that you make to the software back to Twitter (though such feedback is encouraged)</li>
<li>Include the source of Bootstrap itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it</li>
<li>Submit changes that you make to Bootstrap back to Twitter (though such feedback is encouraged)</li>
</ul>
</div>
</div>

10
less/tables.less
View File

@ -152,9 +152,12 @@ table {
// Table backgrounds
// -----------------
// Exact selectors below required to override .table-striped
// Exact selectors below required to override `.table-striped` and prevent
// inheritance to nested tables.
.table > tbody > tr {
.table > thead > tr,
.table > tbody > tr,
.table > tfoot > tr {
> td.active,
> th.active,
&.active > td {
@ -180,7 +183,8 @@ table {
}
}
// Hover states for .table-hover
// Hover states for `.table-hover`
// Note: this is not available for cells or rows within `thead` or `tfoot`.
.table-hover > tbody > tr {
> td.success:hover,
> th.success:hover,