breakpoint 1.2 → 1.3

data/CHANGELOG.markdown

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3 - August 28th, 2012
+* better conversion to base-ems
+* fix floating point error
+
 ## 1.2 - August 16th, 2012
 * Added ability to force the 'all' media type to be written by setting `$breakpoint-force-media-all: true;`. Defaults to `false`.
 * Added ability to generate no query fallback code. See the README for full documentaiton.

data/README.markdown

@@ -431,7 +431,6 @@ $breakpoint-no-query-wrappers: true;
 ```css
 /* no-mq.css */
 .no-mq #foo {
-  background: red;
   background: green;
 }
 ```
@@ -440,8 +439,8 @@ $breakpoint-no-query-wrappers: true;
 
 Licensed under MIT/GPL.
 
-GPL license:
-http://www.gnu.org/licenses/gpl.html
+GPL2 license:
+http://www.gnu.org/licenses/gpl-2.0.html
 
 MIT license:
 http://www.opensource.org/licenses/mit-license.php

data/lib/breakpoint.rb

@@ -3,8 +3,8 @@ require 'compass'
 Compass::Frameworks.register("breakpoint", :path => "#{File.dirname(__FILE__)}/..")
 
 module Breakpoint
-  VERSION = "1.2"
-  DATE = "2012-08-16"
+  VERSION = "1.3"
+  DATE = "2012-08-28"
 end
 
 module Sass::Script::Functions
@@ -16,19 +16,25 @@ module Sass::Script::Functions
     testList = Array.new
     listLength = list.to_a.length - 1
 
-    for i in 0..listLength
-      if list.value[i].class == Sass::Script::List
-        subList = list.value[i].to_a.length - 1
+    # Only check if length greater than zero
+    # Was throwing errors for floats (but strangely, not for ints)
+    if listLength > 0
+      for i in 0..listLength
+        if list.value[i].class == Sass::Script::List
+          subList = list.value[i].to_a.length - 1
 
-        for j in 0..subList
-          testList << list.value[i].value[j]
+          for j in 0..subList
+            testList << list.value[i].value[j]
+          end
+        else
+          testList << list.value[i]
         end
-      else
-        testList << list.value[i]
       end
+      result = testList.include?(feature)
+    else
+      result = false
     end
 
-    result = testList.include?(feature)
     Sass::Script::Bool.new(result)
   end
 end

data/stylesheets/_breakpoint.scss

@@ -12,6 +12,8 @@ $breakpoint-prefixed-queries: 'device-pixel-ratio' 'min-device-pixel-ratio' 'max
 $breakpoint-no-queries:       false           !default;
 $breakpoint-no-query-wrappers: false           !default;
 
+$breakpoint-base-font-size: false;
+
 //////////////////////////////
 // Import Breakpoint Helpers
 //////////////////////////////
@@ -21,7 +23,7 @@ $breakpoint-no-query-wrappers: false           !default;
 //////////////////////////////
 // Breakpoint Mixin
 //////////////////////////////
-@mixin breakpoint($breakpoint, $media: $breakpoint-default-media, $no-query: false) {
+@mixin breakpoint($breakpoint, $media: $breakpoint-default-media, $no-query: false, $base-font-size: $breakpoint-base-font-size) {
   // Query and Media String Defaults
   $query:         false !default;
   $query-holder:  false !default;
@@ -64,24 +66,24 @@ $breakpoint-no-query-wrappers: false           !default;
     @if $do-prefix {
       @each $prfx in $breakpoint-prefixes {
         @if $prfx == 'webkit' {
-          $webkit: breakpoint-switch($breakpoint, $media-string, true, $prfx);
+          $webkit: breakpoint-switch($breakpoint, $media-string, true, $prfx, $base-font-size: $base-font-size);
         }
 
         @if $prfx == 'moz' {
-          $moz: breakpoint-switch($breakpoint, $media-string, true, $prfx);
+          $moz: breakpoint-switch($breakpoint, $media-string, true, $prfx, $base-font-size: $base-font-size);
         }
 
         @if $prfx == 'o' {
-          $o: breakpoint-switch($breakpoint, $media-string, true, $prfx);
+          $o: breakpoint-switch($breakpoint, $media-string, true, $prfx, $base-font-size: $base-font-size);
         }
 
         @if $prfx == 'ms' {
-          $ms: breakpoint-switch($breakpoint, $media-string, true, $prfx);
+          $ms: breakpoint-switch($breakpoint, $media-string, true, $prfx, $base-font-size: $base-font-size);
         }
       }
     }
     @else {
-      $query: breakpoint-switch($breakpoint, $media-string, true);
+      $query: breakpoint-switch($breakpoint, $media-string, true, $base-font-size: $base-font-size);
     }
   }
   @else {
@@ -97,41 +99,41 @@ $breakpoint-no-query-wrappers: false           !default;
         @each $bkpt in $breakpoint {
           @if $prfx == 'webkit' {
             @if $webkit-first {
-              $webkit: breakpoint-switch($bkpt, $media-string, true, $prfx);
+              $webkit: breakpoint-switch($bkpt, $media-string, true, $prfx, $base-font-size: $base-font-size);
               $webkit-first: false;
             }
             @else {
-              $webkit: join($webkit, breakpoint-switch($bkpt, $media-string, $prefix: $prfx));
+              $webkit: join($webkit, breakpoint-switch($bkpt, $media-string, $prefix: $prfx, $base-font-size: $base-font-size));
             }
           }
 
           @if $prfx == 'moz' {
             @if $moz-first {
-              $moz: breakpoint-switch($bkpt, $media-string, true, $prfx);
+              $moz: breakpoint-switch($bkpt, $media-string, true, $prfx, $base-font-size: $base-font-size);
               $moz-first: false;
             }
             @else {
-              $moz: join($moz, breakpoint-switch($bkpt, $media-string, $prefix: $prfx));
+              $moz: join($moz, breakpoint-switch($bkpt, $media-string, $prefix: $prfx, $base-font-size: $base-font-size));
             }
           }
 
           @if $prfx == 'o' {
             @if $o-first {
-              $o: breakpoint-switch($bkpt, $media-string, true, $prfx);
+              $o: breakpoint-switch($bkpt, $media-string, true, $prfx, $base-font-size: $base-font-size);
               $o-first: false;
             }
             @else {
-              $o: join($o, breakpoint-switch($bkpt, $media-string, $prefix: $prfx));
+              $o: join($o, breakpoint-switch($bkpt, $media-string, $prefix: $prfx, $base-font-size: $base-font-size));
             }
           }
 
           @if $prfx == 'ms' {
             @if $ms-first {
-              $ms: breakpoint-switch($bkpt, $media-string, true, $prfx);
+              $ms: breakpoint-switch($bkpt, $media-string, true, $prfx, $base-font-size: $base-font-size);
               $ms-first: false;
             }
             @else {
-              $ms: join($ms, breakpoint-switch($bkpt, $media-string, $prefix: $prfx));
+              $ms: join($ms, breakpoint-switch($bkpt, $media-string, $prefix: $prfx, $base-font-size: $base-font-size));
             }
           }
         }
@@ -140,11 +142,11 @@ $breakpoint-no-query-wrappers: false           !default;
     @else {
       @each $bkpt in $breakpoint {
         @if $first == true {
-          $query: breakpoint-switch($bkpt, $media-string, true);
+          $query: breakpoint-switch($bkpt, $media-string, true, $base-font-size: $base-font-size);
           $first: false;
         }
         @else {
-          $query: join($query, breakpoint-switch($bkpt, $media-string));
+          $query: join($query, breakpoint-switch($bkpt, $media-string, $base-font-size: $base-font-size));
         }
       }
     }
@@ -194,7 +196,7 @@ $breakpoint-no-query-wrappers: false           !default;
   @include TXkgcmVzZXQhIEdvIGF3YXkh;
 }
 
-@function breakpoint-switch($breakpoint, $media-string, $first: false, $prefix: false) {
+@function breakpoint-switch($breakpoint, $media-string, $first: false, $prefix: false, $base-font-size: $breakpoint-base-font-size) {
   // Feature/Value/Length/Query Placehoders:
   $feature:       false !default;
   $min-feature:   "min-#{$breakpoint-default-pair}" !default;
@@ -215,7 +217,7 @@ $breakpoint-no-query-wrappers: false           !default;
 
     // If EM Breakpoints are active, do it!
     @if $breakpoint-to-ems and type-of($value) == 'number' {
-      $value: breakpoint-to-base-em($value);
+      $value: breakpoint-to-base-em($value, $base-font-size);
     }
     // Build the Query
     $query: breakpoint-generate($media-string, $feature, $value, $first);
@@ -237,10 +239,10 @@ $breakpoint-no-query-wrappers: false           !default;
 
       // If EM Breakpoints are active, do it!
       @if $breakpoint-to-ems and type-of($min-value) == 'number' {
-        $min-value: breakpoint-to-base-em($min-value);
+        $min-value: breakpoint-to-base-em($min-value, $base-font-size);
       }
       @if $breakpoint-to-ems and type-of($max-value) == 'number' {
-        $max-value: breakpoint-to-base-em($max-value);
+        $max-value: breakpoint-to-base-em($max-value, $base-font-size);
       }
 
       // Min/Max for given
@@ -262,7 +264,7 @@ $breakpoint-no-query-wrappers: false           !default;
 
       // If EM Breakpoints are active, do it!
       @if $breakpoint-to-ems and type-of($value) == 'number' {
-        $value: breakpoint-to-base-em($value);
+        $value: breakpoint-to-base-em($value, $base-font-size);
       }
 
       // Build the Query
@@ -297,7 +299,7 @@ $breakpoint-no-query-wrappers: false           !default;
 
       // If EM Breakpoints are active, do it!
       @if $breakpoint-to-ems and type-of($value) == 'number' {
-        $value: breakpoint-to-base-em($value);
+        $value: breakpoint-to-base-em($value, $base-font-size);
       }
 
       // Build the Query
@@ -334,10 +336,10 @@ $breakpoint-no-query-wrappers: false           !default;
 
     // If EM Breakpoints are active, do it!
     @if $breakpoint-to-ems and type-of($min-value) == 'number' {
-      $min-value: breakpoint-to-base-em($min-value);
+      $min-value: breakpoint-to-base-em($min-value, $base-font-size);
     }
     @if $breakpoint-to-ems and type-of($max-value) == 'number' {
-      $max-value: breakpoint-to-base-em($max-value);
+      $max-value: breakpoint-to-base-em($max-value, $base-font-size);
     }
 
     @if breakpoint-min-max($feature) == true {

data/stylesheets/breakpoint/_helpers.scss

@@ -1,9 +1,29 @@
 //////////////////////////////
 // Converts the input value to Base EMs
 //////////////////////////////
-@function breakpoint-to-base-em($value) {
+@function breakpoint-to-base-em($value, $base-font-size: false) {
+  $value-unit: unit($value);
+
+  // Will convert relative EMs into root EMs.
+  @if $base-font-size and type-of($base-font-size) == 'number' and $value-unit == 'em' {
+    $base-unit: unit($base-font-size);
+
+    @if $base-unit == 'px' or $base-unit == '%' or $base-unit == 'em' or $base-unit == 'pt' {
+      @return base-conversion($value) / base-conversion($base-font-size) * 1em;
+    }
+    @else {
+      @warn '#{$base-font-size} is not set in valid units for font size!';
+      @return false;
+    }
+  }
+  @else {
+    @return base-conversion($value);
+  }
+}
+
+@function base-conversion($value) {
   $unit: unit($value);
-  
+
   @if $unit == 'px' {
     @return $value / 16px * 1em;
   }
@@ -77,4 +97,4 @@
   @else {
     @return '-#{$prefix}-#{$property}';
   }
-}
+}

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Mason Wendell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-16 00:00:00 -04:00
+date: 2012-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency