mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-23 13:43:11 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
This commit is contained in:
Mark Otto
2013-02-04 11:12:09 -08:00
parent 1f6a988190 db8a78fae6
commit 0a3e3a50fe
8 changed files with 360 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/css/bootstrap.css vendored
View File

@@ -4392,7 +4392,8 @@ a.counter:hover {
transition: 0.6s ease-in-out left;
}
.carousel-inner > .item > img {
.carousel-inner > .item > img,
.carousel-inner > .item > a > img {
display: block;
line-height: 1;
}

3
docs/base-css.html
View File

@@ -854,8 +854,7 @@ For example, <code><section></code> should be wrapped
<code>&lt;th&gt;</code>
</td>
<td>
Special table cell for column (or row, depending on scope and placement) labels<br>
Must be used within a <code>&lt;thead&gt;</code>
Special table cell for column (or row, depending on scope and placement) labels
</td>
</tr>
<tr>

3
docs/templates/pages/base-css.mustache vendored
View File

@@ -794,8 +794,7 @@
<code>&lt;th&gt;</code>
</td>
<td>
{{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}<br>
{{_i}}Must be used within a <code>&lt;thead&gt;</code>{{/i}}
{{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}
</td>
</tr>
<tr>