From fda77e69eb825f6b098a303fedcc96d257b4b050 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 29 Jan 2012 16:58:51 -0800
Subject: [PATCH] move vars and mixins for default grid back to appropriate
 files

---
 docs/assets/bootstrap.zip | Bin 51339 -> 51339 bytes
 less/grid.less            |  25 -------------------------
 less/mixins.less          |  15 +++++++++++++++
 less/variables.less       |  11 +++++++++++
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 21df15cefa873548d274acc4d2c4abb09818e1af..cb200386a733e39d239b41a1f123396fb41b9616 100644
GIT binary patch
delta 458
zcmeC4$lN`VnJ2)TnT3l11cKWq@+h*|zE<_Odp)`Em@pTTM1U%r9b95!9|sdq@eCuV
z;*A%c=mP~NZ!<81icGv9vYE|LUKb>)9%l>HyE!XPpA955JH-+vbSs6C9b{O541Z>B
zx_)Q~Cj&FW2@snmtL8X^4Yqx~IWMPD0A$3=8e5o<PHi<<Xl1Voh9f6`=rw>@rPlXY
z0i>0Cy$MXnb^Ue`kkG%w`b@SUPm6QF!eX-D5o0EBK*)krEIQ%<Q32*LA9X?EWgPWJ
zQhDX5JA{W~mdxacW8z49CL9Yy;xQffhVYQ|<Q+FcGWFnbJ0zaM2`30ocyjp(5dbN%
Bt2O`t

delta 458
zcmeC4$lN`VnJ2)TnT3l11irUT<WXds^h(u#@~g>($Ar0H5<l7|2B@-4hD%KB<6r_R
zo?!%4yz#;leW1YPZ3bpgk%<>XHnSPZ>oWalo2(vZ3)Q<hD^8ycBs4q45+-yjg^?X(
zSbz+FW^THEXb2|*Gr|cFn<lH~ID-wI^lEcnPNe|Iu9r2oFd?1VY5|a`D|=PY90?Ts
z&}#s*O0Dm)0!SVAdJ~wC>-y~?Ak+RG)@Pao^0YVyBrJf+{EiqifdfJoq+-z#2Z#zV
zkNKzzj0aSianu{863Dx9)E&ZunFZACcSL4##4&N09-zpCV}VFKrsLia9!w9=oV?>k
WNTwb<ZimEEIN=202~RFRAp!t8gT`6_

diff --git a/less/grid.less b/less/grid.less
index 4493d0b952..2ef767a4a7 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -2,31 +2,6 @@
 // -----------
 
 
-// Default grid sizing
-// -------------------
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-
-@gridRowWidth:          (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-@gridTotalWidth:        @gridRowWidth;
-
-
-// Columns and offseting mixins
-// ----------------------------
-.columns(@columns: 1) {
-  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
-}
-.offset(@columns: 1) {
-  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-}
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
-  float: left;
-  margin-left: @gridGutterWidth;
-}
-
 // Grid rows and columns
 // ---------------------
 .row {
diff --git a/less/mixins.less b/less/mixins.less
index 2d0e2d4c08..cba2670db1 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -139,6 +139,21 @@
   .clearfix();
 }
 
+// Columns and offseting mixins
+// ----------------------------
+.columns(@columns: 1) {
+  //width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+  width: @gridTotalWidth * ((((@gridGutterWidth+@gridColumnWidth)*@columns)-@gridGutterWidth)/@gridRowWidth);
+}
+.offset(@columns: 1) {
+  margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+}
+// Necessary grid styles for every column to make them appear next to each other horizontally
+.gridColumn() {
+  float: left;
+  margin-left: @gridGutterWidth;
+}
+
 
 
 // CSS3 PROPERTIES
diff --git a/less/variables.less b/less/variables.less
index c1e21978c3..f09a88cdb3 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
 // --------------------------------------------------