VARIABLES NO LONGER IN MAIN.SCSS | Changed $flexbox to $grid-flexbox | Added .gitignore

Author: dariusrosendahl

.gitignore

@@ -0,0 +1,2 @@
+*.log
+thumbs.db

sass/layout/grid.scss

@@ -9,20 +9,11 @@
 	Will not work in IE7 and below.
 */
 
-$flexbox:	 true;
-$grid-gutter:	 12px;
-$grid-gutter-b1: 12px;
-$grid-gutter-b2: 12px;
-$grid-gutter-b3: 12px;
-$grid-gutter-b4: 12px;
-$grid-gutter-b5: 12px;
-$grid-gutter-b6: 12px;
-
 /* Grid basis */
 
 .g {
-	/* You can turn off flexbox by setting $flex: 0; in the variables; */ 
-	@if $flexbox == true {
+	/* You can turn off flexbox by setting $flexbox-grid: 0; in the variables; */ 
+	@if $flexbox-grid == true {
 		display: flex;
 		flex-wrap: wrap;
 		flex-direction: row;

sass/main.scss

@@ -1,6 +1,5 @@
 /* Base */
 @import 'base/reset';
-@import 'base/variables';
 @import 'base/defaults';
 @import 'base/mixins';
 @import 'base/utility';

sass/base/variables.scss renamed to sass/variables.scss

@@ -38,6 +38,16 @@ $container-b4: 996px;
 $container-b5: 1224px;
 $container-b6: 1400px;
 
+/* Grid */
+$flexbox-grid:	 true;
+$grid-gutter:	 12px;
+$grid-gutter-b1: 12px;
+$grid-gutter-b2: 12px;
+$grid-gutter-b3: 12px;
+$grid-gutter-b4: 12px;
+$grid-gutter-b5: 12px;
+$grid-gutter-b6: 12px;
+
 /* Default margin, padding, gutter */
 $padding-default: 	12px;
 $margin-default: 	12px;