modular-scale 0.0.4 → 0.0.5

data/README.mdown

@@ -25,49 +25,12 @@ Compass provides a way for Sass mixins to be easily required into a project, but
 
 Sassy Modular Scale can be used as a function, mixin or a mixin that generates a range of classes to `@extend`.
 
-Examples using the Sass syntax:
-
-```sass
-// Use as a function. Fill in the multiple, base-size, and ratio
-height: modular-scale(7, 14px, $golden)
-
-// Use as a mixin. Fill in the property, multiple, base-size, and ratio
-+modular-scale(line-height, 1, 14px, $golden)
-
-// This method will generate a range of classes to `@extend`
-+modular-scale-classes(6)
-
-h1
-  @extend .ms-2
-h2
-  @extend .ms-1
-h3
-  @extend .ms-0
-    
-// You can also 'lace' multiple ratios together by 
-// passing them in as a list (space-separated)
-.lace
-  width: ms(7, 14px, $golden $fourth)
-  
-// You can also set the $base-size variable to a list
-// to interrelate two significant known sizes in your design
-// note: the starting point of the scale will always be the *lowest* value in this list
-.multibases 
-  width: ms(7, 14px 300px, $golden)
-
-// You can use multiple $base-sizes and multiple $ratios together
-.multibase-multiratio
-  width: ms(7, 14px 300px, $golden $fourth)
-```
-
-Examples using the SCSS syntax:
-
 ```scss
 // Use as a function. Fill in the multiple, base-size, and ratio
-height: modular-scale(7, 14px, $golden);
+height: modular-scale(7, 16px, $golden);
 
 // Use as a mixin. Fill in the property, multiple, base-size, and ratio
-@include modular-scale(line-height, 1, 14px, $golden);
+@include modular-scale(line-height, 1, 16px, $golden);
 
 // This method will generate a range of classes to `@extend`
 @include modular-scale-classes(6);
@@ -79,19 +42,19 @@ h3 { @extend .ms-0; }
 // You can also 'lace' multiple ratios together by 
 // passing them in as a list (space-separated)
 .lace {
-  width: ms(7, 14px, $golden $fourth);
+  width: ms(7, 16px, $golden $fourth);
 }
 
 // You can also set the $base-size variable to a list
 // to interrelate two significant known sizes in your design
 // note: the starting point of the scale will always be the *lowest* value in this list
 .multibases {
-  width: ms(7, 14px 300px, $golden);
+  width: ms(7, 16px 300px, $golden);
 }
   
 // You can use multiple $base-sizes and multiple $ratios together
 .multibase-multiratio {
-  width: ms(7, 14px 300px, $golden $fourth);
+  width: ms(7, 16px 300px, $golden $fourth);
 }
 ```
 
@@ -100,18 +63,23 @@ h3 { @extend .ms-0; }
 
 Below is a list of Ratios to choose from. By default, the variable `$ratio` is set to `$golden`.
 
-* $golden: 1.618
-* $octave: 2 / 1
-* $major-seventh: 15 / 8
-* $minor-seventh: 16 / 9
-* $major-sixth: 5 / 3
-* $minor-sixth: 8 / 5
-* $fifth: 3 / 2
-* $fourth: 4 / 3
-* $major-third: 5 / 4
-* $minor-third: 6 / 5
-* $major-second: 9 / 8
-* $minor-second: 16 / 15
+* $golden: 1.618 
+* $double-octave: (4 / 1)
+* $major-twelfth: (3 / 1)
+* $major-eleventh: (8 / 3)
+* $major-tenth: (5 / 2)
+* $octave: (2 / 1)
+* $major-seventh: (15 / 8)
+* $minor-seventh: (16 / 9)
+* $major-sixth: (5 / 3)
+* $minor-sixth: (8 / 5)
+* $fifth: (3 / 2)
+* $augfourth: (1 / √2)
+* $fourth: (4 / 3)
+* $major-third: (5 / 4)
+* $minor-third: (6 / 5)
+* $major-second: (9 / 8)
+* $minor-second: (16 / 15)
 
 ## Inspiration
 

data/lib/modular-scale.rb

@@ -3,7 +3,7 @@ Compass::Frameworks.register("modular-scale", :path => "#{File.dirname(__FILE__)
 
 module ModularScale
   
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
   DATE = "2011-09-15"
 
 end

data/stylesheets/_modular-scale.sass

@@ -1,14 +1,22 @@
 // SASSY MODULAR-SCALE
 // https://github.com/scottkellum/modular-scale
 
+@charset "UTF-8"
+
 // Ratios
 $golden: 1.618 
+$gold: $golden
+$double-octave: (4 / 1)
+$major-twelfth: (3 / 1)
+$major-eleventh: (8 / 3)
+$major-tenth: (5 / 2)
 $octave: (2 / 1)
 $major-seventh: (15 / 8)
 $minor-seventh: (16 / 9)
 $major-sixth: (5 / 3)
 $minor-sixth: (8 / 5)
 $fifth: (3 / 2)
+$augfourth: (1 / 1.4142135623730950488) // (1 / √2)
 $fourth: (4 / 3)
 $major-third: (5 / 4)
 $minor-third: (6 / 5)
@@ -17,7 +25,7 @@ $minor-second: (16 / 15)
 
 // Defaults
 $ratio: $golden !default
-$base-size: 12px !default
+$base-size: 16px !default
 $property: font-size !default
 $class-slug: ms !default
 
@@ -307,3 +315,6 @@ $class-slug: ms !default
       @if nth($list, $i) <= $start
         $trimmed: append($trimmed, nth($list, $i))
   @return $trimmed
+
+// Other libraries can easily query if this function is avalible
+$modular-scale-loaded: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70224884013320 !ruby/object:Gem::Requirement
+  requirement: &70108860747360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *70224884013320
+  version_requirements: *70108860747360
 description: Sassy Modular Scale calculates the incremental values of the modular
   scale.
 email:
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 599198530152420284
+      hash: -3912929455498838517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: