breakpoint 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187581b23b36b6c3c281fc34fcbe3c4132cf6bc7
-  data.tar.gz: 1281f213b32e0bfa780dd060a569170b568d8f62
+  metadata.gz: ea2d03a4e01463ea1ae41b5f3b52d5cca388d603
+  data.tar.gz: 364a78b11720bcd783aa5a56a3350ac4e9982abe
 SHA512:
-  metadata.gz: 371973f6a05ee72454db2f96c90c96e444e84e3d6992e2f0df8ca1c06707cc84ed1976713489ec91a2a4ec23c7df2cefd1614cc8dcdd58ac3c8926f7a4699774
-  data.tar.gz: e7e13771c4fff147c92ee0303122081426906f399766217dbf8aa8d68a90786675e7d08b52a5285a77249c073505f83c991cbb03da598f268c41f6c5011f86b3
+  metadata.gz: 22959cd46b60d83ea6eb0340ef97534aff9c54c1c96db5d4176010979e37aa1d2174c4ecc29c0441e09045e77998169b1c38447ba861c498c816dfa17a268d83
+  data.tar.gz: 55c46febac5519b5f9a16ec8cd708a69362fd6dce141703109ef9a6fff6496daa7e5f0f4d4e0adfe5de4b972552e5eada4bf0047968caaee04e1d61a7405423c

data/lib/breakpoint.rb

@@ -3,6 +3,6 @@ require 'compass'
 Compass::Frameworks.register("breakpoint", :path => "#{File.dirname(__FILE__)}/..")
 
 module Breakpoint
-  VERSION = "2.3.0"
-  DATE = "2013-12-02"
+  VERSION = "2.3.1"
+  DATE = "2013-12-04"
 end

data/stylesheets/breakpoint/_parsers.scss

@@ -59,21 +59,20 @@
     }
   }
 
-  @if length($contexts) == 0 or nth($contexts, 1) == false {
-    $return: ('query': $query-string,
-              'fallback': $query-fallback,
-              'context holder': $private-breakpoint-context-holder,
-              'query count': $private-breakpoint-query-count
-    );
-  }
-  @else {
+  $return: ('query': $query-string,
+	    'fallback': $query-fallback,
+	    'context holder': $private-breakpoint-context-holder,
+	    'query count': $private-breakpoint-query-count
+  );
+  @if length($contexts) > 0 and nth($contexts, 1) != false {
     @if $query-fallback != false {
       $context-setter: private-breakpoint-set-context('no-query', $query-fallback);
     }
-
+    $context-map: ();
     @each $context in $contexts {
-      $return: map-merge($return, ($context: breakpoint-get-context($context)));
+      $context-map: map-merge($context-map, ($context: breakpoint-get-context($context)));
     }
+    $return: map-merge($return, (context: $context-map));
   }
 
   // Reset Global Private Breakpoint Context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breakpoint
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Mason Wendell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -68,7 +68,9 @@ files:
 - stylesheets/breakpoint/parsers/single/_default.scss
 - stylesheets/breakpoint/parsers/triple/_default.scss
 homepage: https://github.com/Team-Sass/breakpoint
-licenses: []
+licenses:
+- MIT
+- GPL-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []