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

adding table variables

Browse Source
This commit is contained in:
Mark Otto 2012-03-05 22:47:39 -08:00
parent ac6eff280d
commit d98a2e9234
4 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

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

@ -1078,6 +1078,7 @@ table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
background-color: transparent;
}
.table {
width: 100%;
@ -1088,7 +1089,7 @@ table {
line-height: 18px;
text-align: left;
vertical-align: top;
border-top: 1px solid #ddd;
border-top: 1px solid #dddddd;
}
.table th {
font-weight: bold;
@ -1100,13 +1101,13 @@ table {
border-top: 0;
}
.table tbody + tbody {
border-top: 2px solid #ddd;
border-top: 2px solid #dddddd;
}
.table-condensed th, .table-condensed td {
padding: 4px 5px;
}
.table-bordered {
border: 1px solid #ddd;
border: 1px solid #dddddd;
border-left: 0;
border-collapse: separate;
*border-collapse: collapsed;
@ -1115,11 +1116,11 @@ table {
border-radius: 4px;
}
.table-bordered th, .table-bordered td {
border-left: 1px solid #ddd;
border-left: 1px solid #dddddd;
}
.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
border-top: 0;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid #dddddd;
}
.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
-webkit-border-radius: 4px 0 0 0;

15
less/tables.less
View File

@ -11,6 +11,7 @@ table {
max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
background-color: @tableBackground;
}
// BASELINE STYLES
@ -26,7 +27,7 @@ table {
line-height: @baseLineHeight;
text-align: left;
vertical-align: top;
border-top: 1px solid #ddd;
border-top: 1px solid @tableBorder;
}
th {
font-weight: bold;
@ -42,7 +43,7 @@ table {
}
// Account for multiple tbody instances
tbody + tbody {
border-top: 2px solid #ddd;
border-top: 2px solid @tableBorder;
}
}
@ -63,21 +64,21 @@ table {
// ----------------
.table-bordered {
border: 1px solid #ddd;
border: 1px solid @tableBorder;
border-left: 0;
border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapsed; // IE7 can't round corners anyway
.border-radius(4px);
th,
td {
border-left: 1px solid #ddd;
border-left: 1px solid @tableBorder;
}
// Prevent a double border
thead:first-child tr:first-child th,
tbody:first-child tr:first-child th,
tbody:first-child tr:first-child td {
border-top: 0;
border-bottom: 1px solid #ddd;
border-bottom: 1px solid @tableBorder;
}
// For first th or td in the first row in the first thead or tbody
thead:first-child tr:first-child th:first-child,
@ -108,7 +109,7 @@ table {
tbody {
tr:nth-child(odd) td,
tr:nth-child(odd) th {
background-color: #f9f9f9;
background-color: @tableBackgroundAccent;
}
}
}
@ -120,7 +121,7 @@ table {
.table {
tbody tr:hover td,
tbody tr:hover th {
background-color: #f5f5f5;
background-color: @tableBackgroundHover;
}
}

24
less/variables.less
View File

@ -7,7 +7,9 @@
// GLOBAL VALUES
// --------------------------------------------------
// Grays
// -------------------------
@black: #000;
@grayDarker: #222;
@grayDark: #333;
@ -16,7 +18,9 @@
@grayLighter: #eee;
@white: #fff;
// Accent colors
// -------------------------
@blue: #049cdb;
@blueDark: #0064cd;
@green: #46a546;
@ -26,15 +30,21 @@
@pink: #c3325f;
@purple: #7a43b6;
// Scaffolding
// -------------------------
@bodyBackground: @white;
@textColor: @grayDark;
// Links
// -------------------------
@linkColor: #08c;
@linkColorHover: #069;
// Typography
// -------------------------
@baseFontSize: 13px;
@baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@baseLineHeight: 18px;
@ -44,7 +54,17 @@
@headingsFontWeight: normal; // instead of browser default, bold
@headingsColor: ''; // empty to use BS default, @textColor
// Tables
// -------------------------
@tableBackground: transparent; // overall background-color
@tableBackgroundAccent: #f9f9f9; // for striping
@tableBackgroundHover: #f5f5f5; // for hover
@tableBorder: #ddd; // table and cell border
// Buttons
// -------------------------
@btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%);
@btnBorder: #ccc;
@ -67,13 +87,17 @@
@btnInverseBackground: @gray;
@btnInverseBackgroundHighlight: @grayDarker;
// Forms
// -------------------------
@inputBackground: @white;
@inputBorder: #ccc;
@inputDisabledBackground: @grayLighter;
// Dropdowns
// -------------------------
@dropdownBackground: @white;
@dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white;