From ecf6077f480f0ff255e38c6643a23b5d74ef53f3 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 30 Sep 2012 23:59:35 -0700
Subject: [PATCH] remove table grid sizing, it can use the new default grid
columns instead
---
docs/assets/css/bootstrap.css | 144 ----------------------------------
less/mixins.less | 7 --
less/tables.less | 37 ++-------
3 files changed, 5 insertions(+), 183 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 742a27ebe9..e9be205647 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1834,150 +1834,6 @@ table [class*=span] {
margin-left: 0;
}
-.table .span1 {
- float: none;
- width: 44px;
- margin-left: 0;
-}
-
-.table .span2 {
- float: none;
- width: 124px;
- margin-left: 0;
-}
-
-.table .span3 {
- float: none;
- width: 204px;
- margin-left: 0;
-}
-
-.table .span4 {
- float: none;
- width: 284px;
- margin-left: 0;
-}
-
-.table .span5 {
- float: none;
- width: 364px;
- margin-left: 0;
-}
-
-.table .span6 {
- float: none;
- width: 444px;
- margin-left: 0;
-}
-
-.table .span7 {
- float: none;
- width: 524px;
- margin-left: 0;
-}
-
-.table .span8 {
- float: none;
- width: 604px;
- margin-left: 0;
-}
-
-.table .span9 {
- float: none;
- width: 684px;
- margin-left: 0;
-}
-
-.table .span10 {
- float: none;
- width: 764px;
- margin-left: 0;
-}
-
-.table .span11 {
- float: none;
- width: 844px;
- margin-left: 0;
-}
-
-.table .span12 {
- float: none;
- width: 924px;
- margin-left: 0;
-}
-
-.table .span13 {
- float: none;
- width: 1004px;
- margin-left: 0;
-}
-
-.table .span14 {
- float: none;
- width: 1084px;
- margin-left: 0;
-}
-
-.table .span15 {
- float: none;
- width: 1164px;
- margin-left: 0;
-}
-
-.table .span16 {
- float: none;
- width: 1244px;
- margin-left: 0;
-}
-
-.table .span17 {
- float: none;
- width: 1324px;
- margin-left: 0;
-}
-
-.table .span18 {
- float: none;
- width: 1404px;
- margin-left: 0;
-}
-
-.table .span19 {
- float: none;
- width: 1484px;
- margin-left: 0;
-}
-
-.table .span20 {
- float: none;
- width: 1564px;
- margin-left: 0;
-}
-
-.table .span21 {
- float: none;
- width: 1644px;
- margin-left: 0;
-}
-
-.table .span22 {
- float: none;
- width: 1724px;
- margin-left: 0;
-}
-
-.table .span23 {
- float: none;
- width: 1804px;
- margin-left: 0;
-}
-
-.table .span24 {
- float: none;
- width: 1884px;
- margin-left: 0;
-}
-
.table tbody tr.success td {
background-color: #dff0d8;
}
diff --git a/less/mixins.less b/less/mixins.less
index ee360d734b..8cd741d2db 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -472,13 +472,6 @@
.clearfix();
}
-// Table columns
-.tableColumns(@columnSpan: 1) {
- float: none; // undo default grid column styles
- width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
- margin-left: 0; // undo default grid column styles
-}
-
// Make a Grid
// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
.makeRow() {
diff --git a/less/tables.less b/less/tables.less
index ecf9536f6f..1d1b2b0ec3 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -3,9 +3,6 @@
// --------------------------------------------------
-// BASE TABLES
-// -----------------
-
table {
max-width: 100%;
background-color: @tableBackground;
@@ -13,6 +10,8 @@ table {
border-spacing: 0;
}
+
+
// BASELINE STYLES
// ---------------
@@ -63,6 +62,7 @@ table {
}
+
// BORDERED VERSION
// ----------------
@@ -139,7 +139,6 @@ table {
-
// ZEBRA-STRIPING
// --------------
@@ -154,6 +153,7 @@ table {
}
+
// HOVER EFFECT
// ------------
// Placed here since it has to come after the potential zebra striping
@@ -167,6 +167,7 @@ table {
}
+
// TABLE CELL SIZING
// -----------------
@@ -177,34 +178,6 @@ table [class*=span] {
margin-left: 0; // undo default grid column styles
}
-// Change the column widths to account for td/th padding
-.table {
- .span1 { .tableColumns(1); }
- .span2 { .tableColumns(2); }
- .span3 { .tableColumns(3); }
- .span4 { .tableColumns(4); }
- .span5 { .tableColumns(5); }
- .span6 { .tableColumns(6); }
- .span7 { .tableColumns(7); }
- .span8 { .tableColumns(8); }
- .span9 { .tableColumns(9); }
- .span10 { .tableColumns(10); }
- .span11 { .tableColumns(11); }
- .span12 { .tableColumns(12); }
- .span13 { .tableColumns(13); }
- .span14 { .tableColumns(14); }
- .span15 { .tableColumns(15); }
- .span16 { .tableColumns(16); }
- .span17 { .tableColumns(17); }
- .span18 { .tableColumns(18); }
- .span19 { .tableColumns(19); }
- .span20 { .tableColumns(20); }
- .span21 { .tableColumns(21); }
- .span22 { .tableColumns(22); }
- .span23 { .tableColumns(23); }
- .span24 { .tableColumns(24); }
-}
-
// TABLE BACKGROUNDS
--
GitLab