mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-14 01:24:19 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Jacob Thornton
2012-01-11 21:43:43 -08:00
parent 6f2f947a43 a2ebf0c0c1
commit 19090ea333
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bootstrap.css vendored
View File

@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Jan 11 20:37:24 PST 2012 * Date: Wed Jan 11 21:43:40 PST 2012
*/ */
html, body { html, body {
margin: 0; margin: 0;
@@ -993,6 +993,9 @@ th {
td { td {
vertical-align: top; vertical-align: top;
} }
tbody + tbody {
border-top: 2px solid #ddd;
}
.condensed-table th, .condensed-table td { .condensed-table th, .condensed-table td {
padding: 4px 5px; padding: 4px 5px;
} }

1
bootstrap.min.css vendored
View File

@@ -179,6 +179,7 @@ table{width:100%;margin-bottom:18px;}
th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;} th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
th{font-weight:bold;vertical-align:bottom;} th{font-weight:bold;vertical-align:bottom;}
td{vertical-align:top;} td{vertical-align:top;}
tbody+tbody{border-top:2px solid #ddd;}
.condensed-table th,.condensed-table td{padding:4px 5px;} .condensed-table th,.condensed-table td{padding:4px 5px;}
.bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;} .bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;}
.bordered-table thead:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child td{border-top:0;} .bordered-table thead:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child td{border-top:0;}

2
docs/scaffolding.html
View File

@@ -196,7 +196,7 @@
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<h3>Variables in LESS</h3> <h3>Variables in LESS</h3>
<p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in mixins.less.</p> <p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>How to customize</h3> <h3>How to customize</h3>

3
lib/tables.less
View File

@@ -26,6 +26,9 @@ th {
td { td {
vertical-align: top; vertical-align: top;
} }
tbody + tbody {
border-top: 2px solid #ddd;
}
// CONDENSED TABLE W/ HALF PADDING // CONDENSED TABLE W/ HALF PADDING