aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-05 22:47:39 -0800
committerMark Otto <[email protected]>2012-03-05 22:47:39 -0800
commitd98a2e92340509fe9835103c799d3433c0c0d961 (patch)
tree7619965c62a361a7dd7db9dca9adb87211c6b4c5
parentac6eff280df58a96bfd429189d2dd2d6e5c38208 (diff)
downloadbootstrap-d98a2e92340509fe9835103c799d3433c0c0d961.tar.xz
bootstrap-d98a2e92340509fe9835103c799d3433c0c0d961.zip
adding table variables
-rw-r--r--docs/assets/bootstrap.zipbin54898 -> 9620 bytes
-rw-r--r--docs/assets/css/bootstrap.css11
-rw-r--r--less/tables.less15
-rw-r--r--less/variables.less24
4 files changed, 38 insertions, 12 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ea89c1647..29d217092 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3e0cbf11b..330c57f96 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
diff --git a/less/tables.less b/less/tables.less
index d8bce582f..15318e8f5 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -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;
}
}
diff --git a/less/variables.less b/less/variables.less
index 2d31cc0a3..74290b7ba 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -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;