2.0.0-rc1

Squashed a few more bugs and added dynamic calculatins for the fluid grid gutters
atomicpages · Jul 26, 2014 · da7e120 · da7e120
1 parent ecd0251
commit da7e120
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/skeleton/core/_config.scss b/skeleton/core/_config.scss
@@ -5,23 +5,21 @@
 // partial in that flavor.
 
 // background vars
-$background-color: #fff !global; // default background information
+$background-color: #fff !global; // default background color
 
-// FONTS
+// GENERAL
+$use-global-border-box: true !global; // use global border box?
 $use-rem: true !global; // use rem as default unit?
 $use-em: false !global; // use em as default unit?
 $use-percent: false !global; // use percentage as default unit?
 $use-px-fallback: true !global; // allow for pixel fall back
-$use-global-border-box: true !global; // use global border box?
 
-	// Font size and families
-	$font-size: 14px !global;  // default font size. Change here will adjust sizes across the board.
-	$font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif !global; // default fonts
-	$heading-family: "Georgia", "Times New Roman", serif !global; // default heading (h1-h6) font
-	$font-color: #444 !global;  // default font color
-	$heading-color: #181818 !global; // default heading (h1-h6) color
-
-// form vars
+// FONTS
+$font-size: 14px !global;  // default font size. Change here will adjust sizes across the board.
+$font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif !global; // default fonts
+$heading-family: "Georgia", "Times New Roman", serif !global; // default heading (h1-h6) font
+$font-color: #444 !global;  // default font color
+$heading-color: #181818 !global; // default heading (h1-h6) color
 $form-font: $font-family !global; // default form font
 
 // LINKS
@@ -35,7 +33,7 @@ $is-fluid: false !global; // Change to true to enable the fluid grid
 $base-col-width: 40px !global; // The width of each columns
 $base-gutter-width: 20px !global; // The space between columns
 $base-col-count: 16 !global; // The number of columns
-$base-width: if($is-fluid, 98%, ($base-col-width + $base-gutter-width) * $base-col-count) !global; // Why not generate it for you?
+$base-width: if($is-fluid, 98%, ($base-col-width + $base-gutter-width) * $base-col-count) !global; // Calculated
 
 // BREAKPOINTS AND CONTAINER WIDTHS
 $tablet-width: 768px !global; // the tablet width media query

diff --git a/skeleton/core/_dependencies.scss b/skeleton/core/_dependencies.scss
@@ -7,12 +7,13 @@
 @mixin _fluidGrid($colCount) {
 	// override only for fluid
 	/* Overrides */
+	$gutter: percent($base-gutter-width) / 100;
 	.container {
 		.column,
 		.columns {
 			margin: {
-				left: 1%;
-				right: 1%;
+				left: $gutter / 2;
+				right: $gutter / 2;
 			}
 		}
 	}

diff --git a/skeleton/themes/sphenoid/marrow/_public.scss b/skeleton/themes/sphenoid/marrow/_public.scss
@@ -51,7 +51,7 @@
 
 // @border-radius ( $radii... )
 @mixin border-radius($radii...) {
-	@if length($shadow) > 4 {
+	@if length($radii) > 4 {
 		@warn("$radii should only accept four argument for each side of the box. Using more may cause undesired results");
 	}
 	@include prefixer(border-radius, $radii, webkit moz ms o spec);