aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-21 15:18:05 -0800
committerMark Otto <[email protected]>2012-02-21 15:18:05 -0800
commit8665fa8c50bf93844f692e954fd9669ba4b8bd3b (patch)
treeca49c411370860d6d25236d7c43fffb28fcd36eb /less
parent575072b74be5211aca48b22c1a891f930b793f66 (diff)
downloadbootstrap-8665fa8c50bf93844f692e954fd9669ba4b8bd3b.tar.xz
bootstrap-8665fa8c50bf93844f692e954fd9669ba4b8bd3b.zip
move table columns mixin to mixins.less
Diffstat (limited to 'less')
-rw-r--r--less/mixins.less9
-rw-r--r--less/tables.less5
2 files changed, 9 insertions, 5 deletions
diff --git a/less/mixins.less b/less/mixins.less
index 80bfdf945..0e33591f7 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -319,6 +319,15 @@
}
}
+// Table grid system
+// -------------------------
+.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
diff --git a/less/tables.less b/less/tables.less
index 089267d87..1342de2ff 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -129,11 +129,6 @@ table {
// -----------------
// Change the columns
-.tableColumns(@columnSpan: 1) {
- float: none;
- width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16;
- margin-left: 0;
-}
table {
.span1 { .tableColumns(1); }
.span2 { .tableColumns(2); }