Fixing all of the Modular Scale, Compass, and Sass version issues. Gu…

…mby works with the latest after this fix
GumbyFramework · Aug 25, 2014 · 8473e11 · 8473e11 · jasontipton · Dec 16, 2014
1 parent dff1c89
commit 8473e11
Show file tree

Hide file tree

Showing 7 changed files with 459 additions and 461 deletions.
diff --git a/config.rb b/config.rb
@@ -2,12 +2,12 @@
 
 # Tell compass where to find local extensions
 # If you followed directions and ran 'gem install modular-scale' comment the next two lines out:
-extensions_dir = "sass/extensions"
+# extensions_dir = "sass/extensions"
 
-Compass::Frameworks.register('modular-scale', :path => File.expand_path("#{extensions_dir}/modular-scale"))
+# Compass::Frameworks.register('modular-scale', :path => File.expand_path("#{extensions_dir}/modular-scale"))
 
 # Uncomment these to use regular Ruby gems.
-# require 'modular-scale'
+require 'modular-scale'
 # require 'sassy-math'
 
 # Set this to the root of your project when deployed:

diff --git a/css/gumby.css b/css/gumby.css
diff --git a/sass/_typography.scss b/sass/_typography.scss
@@ -51,9 +51,9 @@ h6 { @include font-size($norm);}
 }
 
 /*=====================================================
- 
+
   Links & Paragraph styles
-  
+
   ======================================================*/
 
 p {
@@ -85,7 +85,7 @@ a {
 /*=====================================================
 
   Lists
-  
+
  ======================================================*/
 
 ul, ol {
@@ -137,7 +137,7 @@ dl dt {
 }
 
 @include respond(portrait-tablets) {
-  
+
   ul, ol, dl, p { text-align: left;}
 
 }

diff --git a/sass/functions/_button-size.scss b/sass/functions/_button-size.scss
@@ -13,7 +13,7 @@
     $n: $small-button-font-size;
   }
   $button-font-size: $n;
-  $button-height: ms($ratio, $button-font-size) + 1;
+  $button-height: ms($ms-ratio, $button-font-size) + 1;
   $line-height: $button-height - 2;
 
   @include font-size($button-font-size);

diff --git a/sass/functions/_height-calc.scss b/sass/functions/_height-calc.scss
@@ -2,5 +2,5 @@
 // Calculate the height of an object based on its scale
 
 @function height-calc($size) {
-  @return ms($ratio, $size) + 1;
+  @return ms($ms-ratio, $size) + 1;
 }
diff --git a/sass/functions/_typography.scss b/sass/functions/_typography.scss
@@ -12,4 +12,4 @@
     font-size: $size + px;
     font-size: ($size / strip-units($base-font-size)) + rem;
   }
-}
+}
diff --git a/sass/var/_settings.scss b/sass/var/_settings.scss
@@ -39,17 +39,16 @@ $button-font-weight: $font-weight-semibold;
 $tabs-font-weight: $font-weight-semibold;
 
 // Vertical Rhythm Spacing
-$base-line-height: ms(1) !default;
+//$base-line-height: ms(1) !default;
 $rhythm-spacing: .168;
 $rhythm-height: .711;
 
 // Modular Scale Settings
 // http://www.modularscale.com by Tim Brown
 // https://github.com/scottkellum/modular-scale
-$ratio: golden();						// Ratio for Modular Scale
-$base-font-size: 16px !default;
-$importantNum: 78px !default;
-$base-size: $base-font-size $importantNum;
+$ms-ratio: $golden;						// Ratio for Modular Scale
+$ms-base: 16px 78px;
+$base-font-size: ms(0);
 // Gumby Default Scale Values: 16, 18, 26, 30, 42, 48, 68, 78, 110, 126;
 
 // Sizing
@@ -166,4 +165,3 @@ $tt-pretty: yes;					// yes = pretty / no = flat
 // Floats
 $default-float: left;
 $switch-float: right;
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ @@
         font-size: $size + px;
         font-size: ($size / strip-units($base-font-size)) + rem;
       }
-    }
+    }