aboutsummaryrefslogtreecommitdiff
path: root/less/variables.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-29 19:07:14 -0800
committerJacob Thornton <[email protected]>2012-01-29 19:07:14 -0800
commit0de951f4f41c798dead8525e78153fc6c5da1479 (patch)
tree4bd75bf2531609e23d743416a9bee7ac7338769c /less/variables.less
parentfae04c8ac1da675338c1cfaf3922223980667281 (diff)
parent2ba1b01f8d9a0410d9cf45532d8924d858af74cd (diff)
downloadbootstrap-0de951f4f41c798dead8525e78153fc6c5da1479.tar.xz
bootstrap-0de951f4f41c798dead8525e78153fc6c5da1479.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'less/variables.less')
-rw-r--r--less/variables.less11
1 files changed, 11 insertions, 0 deletions
diff --git a/less/variables.less b/less/variables.less
index c1e21978c..f09a88cdb 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -40,6 +40,17 @@
+// GRID SYSTEM VARIABLES
+// --------------------------------------------------
+
+@gridColumns: 12;
+@gridColumnWidth: 60px;
+@gridGutterWidth: 20px;
+@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+@gridTotalWidth: @gridRowWidth;
+
+
+
// COMPONENT VARIABLES
// --------------------------------------------------