modular-scale 0.0.3 → 0.0.4

data/lib/modular-scale.rb

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

data/stylesheets/_modular-scale.sass

@@ -1,3 +1,6 @@
+// SASSY MODULAR-SCALE
+// https://github.com/scottkellum/modular-scale
+
 // Ratios
 $golden: 1.618 
 $octave: (2 / 1)
@@ -32,19 +35,27 @@ $class-slug: ms !default
   // and multiple ratios are passed in as a list
   // calculate values in using each base-size / ratio combination
   @if type-of($base-size) == 'list' and type-of($ratio) == 'list'
+    @if unit(ms-multibase-multiratio($multiple, $base-size, $ratio)) == 'px'
+      @return round(ms-multibase-multiratio($multiple, $base-size, $ratio))
     @return ms-multibase-multiratio($multiple, $base-size, $ratio)
     
   // if multiple base-sizes are passed in as a list
   // calculate values in using each base-size
   @if type-of($base-size) == 'list' and type-of($ratio) == 'number'
+    @if unit(ms-multibase($multiple, $base-size, $ratio)) == 'px'
+      @return round(ms-multibase($multiple, $base-size, $ratio))
     @return ms-multibase($multiple, $base-size, $ratio)
       
   // if multiple ratios are passed in as a list
   // calculate values in using each ratio
   @if type-of($base-size) == 'number' and type-of($ratio) == 'list'
+    @if unit(ms-multiratio($multiple, $base-size, $ratio)) == 'px'
+      @return round(ms-multiratio($multiple, $base-size, $ratio))
     @return ms-multiratio($multiple, $base-size, $ratio)
     
   // If there are no lists just run the simple function
+  @if unit(exponent($ratio, $multiple) * $base-size) == 'px'
+    @return round(exponent($ratio, $multiple) * $base-size)
   @return exponent($ratio, $multiple) * $base-size
   
   
@@ -200,8 +211,10 @@ $class-slug: ms !default
   @return modular-scale($multiple, $base-size, $ratio)
 
 // Mixin
+// Deprecated. Use the modular-scale() function instead
 =modular-scale($property, $multiple, $base-size, $ratio)
   // Print the $property and return the value from the Modular Scale function
+  @warn "The modular-scale mixin is deprecated. Instead use the function: width: modular-scale(3)" 
   #{$property}: modular-scale($multiple, $base-size, $ratio)
 
 // Classes Mixin
@@ -209,7 +222,9 @@ $class-slug: ms !default
   // Loop from 0 through the value of $multiple and generate a range of classes
   @for $i from 0 through $multiple
     .#{$class-slug}-#{$i}
-      +modular-scale($property, $i, $base-size, $ratio)
+      // Print the $property and return the value from the Modular Scale function
+      #{$property}: modular-scale($i, $base-size, $ratio)
+      
 
 /////////////////////////////////////////////////////////////////////////
 

metadata

@@ -1,74 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: modular-scale
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Scott Kellum
 - Adam Stacoviak
 - Mason Wendell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: compass
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70224884013320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-description: Sassy Modular Scale calculates the incremental values of the modular scale.
-email: 
+  version_requirements: *70224884013320
+description: Sassy Modular Scale calculates the incremental values of the modular
+  scale.
+email:
 - scott@scottkellum.com
 - adam@stacoviak.com
 - mason@zivtech.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.mdown
 - lib/modular-scale.rb
 - stylesheets/_modular-scale.sass
 homepage: https://github.com/scottkellum/modular-scale
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2683294284608242582
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 599198530152420284
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Sassy Modular Scale calculates the incremental values of the modular scale in proportion to a set size and ratio. Inspired by and adapted from Tim Brown's modularscale.com.
+summary: Sassy Modular Scale calculates the incremental values of the modular scale
+  in proportion to a set size and ratio. Inspired by and adapted from Tim Brown's
+  modularscale.com.
 test_files: []
-