Merge golden-ratio into modular-scale mixin

thoughtbot · Jan 18, 2012 · 7d701f5 · 7d701f5
1 parent ec31333
commit 7d701f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/app/assets/stylesheets/_bourbon.scss b/app/assets/stylesheets/_bourbon.scss
@@ -1,7 +1,6 @@
 // Custom Functions
 @import "functions/deprecated-webkit-gradient";
 @import "functions/modular-scale";
-@import "functions/golden-ratio";
 @import "functions/grid-width";
 @import "functions/tint-shade";
 

diff --git a/app/assets/stylesheets/functions/_golden-ratio.scss b/app/assets/stylesheets/functions/_golden-ratio.scss
diff --git a/app/assets/stylesheets/functions/_modular_scale.scss b/app/assets/stylesheets/functions/_modular_scale.scss
@@ -28,3 +28,13 @@
 //  }
 //
 // modularscale.com
+
+@function golden-ratio($value, $increment) {
+  @return modular-scale($value, $increment, 1.618)
+}
+
+//  div {
+//    font-size: golden-ratio(14px, 1); // returns: 22.652px
+//  }
+//
+// goldenratiocalculator.com