aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-02-28 22:47:32 -0800
committerMark Otto <[email protected]>2013-02-28 22:47:32 -0800
commit4418c82888745139d4adf0b5ecf8c5b1b3d3c39c (patch)
tree814dfeccfed81e75f8b4f836fbb17070e909161e
parentbfc4aaf6e84f20728258672276ccc9db84638082 (diff)
downloadbootstrap-4418c82888745139d4adf0b5ecf8c5b1b3d3c39c.tar.xz
bootstrap-4418c82888745139d4adf0b5ecf8c5b1b3d3c39c.zip
Fixes #6954: properly reset grid classes within tables
-rw-r--r--docs/assets/css/bootstrap.css10
-rw-r--r--less/tables.less13
2 files changed, 15 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 299933d4b..c078ea4af 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -975,11 +975,15 @@ th {
background-color: #f5f5f5;
}
-table td[class*="span"],
-table th[class*="span"] {
+table col[class^="span"] {
+ display: table-column;
+ float: none;
+}
+
+table td[class^="span"],
+table th[class^="span"] {
display: table-cell;
float: none;
- margin-left: 0;
}
.table tbody tr.success > td {
diff --git a/less/tables.less b/less/tables.less
index 67f7cd765..6a4e5e4fd 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -177,12 +177,15 @@ th {
// TABLE CELL SIZING
// -----------------
-// Reset default grid behavior
-table td[class*="span"],
-table th[class*="span"] {
+// Reset default table behavior
+table col[class^="span"] {
+ float: none;
+ display: table-column;
+}
+table td[class^="span"],
+table th[class^="span"] {
+ float: none;
display: table-cell;
- float: none; // undo default grid column styles
- margin-left: 0; // undo default grid column styles
}
// TABLE BACKGROUNDS