breakpoint-slicer 1.1 → 1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTlkMzRkMjU0YjJkYjYzNzgwMmQ3NjNjNmQ2MWFkODdjNmU2ZDc2Ng==
-  data.tar.gz: !binary |-
-    ZjJiMzQyOWU0MDZjMjFkYzNjY2ExMDJhZGQyZjkwMjljMmEyMWNjOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGMwNzFkNWJkODI4MGY1ZmI1YjYzYTU2MmVkZjdkMGMwMzI5ODkzZmNiY2U4
-    MTFmOTdhODZkNDg0ODNmYTZlZjJiNzk1ZmM4MzZjNjdiNmRjMzkxZTkwYzA5
-    OWU4YTJjMWExZDkzN2RhZTYwN2EzZTRjZGVhNjc2NDhhYmMxNzA=
-  data.tar.gz: !binary |-
-    MjIzZjgwMDM5ZDM3NzU2ODdjNDVhMTk0NTY1MmI0NjNjNWQwNTNjZTMzNjMz
-    ZjY2MmFlYzZjZTgyZGUyYjRlZmE2ZDU1MWZiZTQ3OWJkMzI0MDMwMjQzN2Y2
-    ZTI1M2QxZjYwYjE4NTExZTIwYTI1YjdhOTkxNDZjNTk5OTg1ZDQ=
+SHA1:
+  metadata.gz: 733c03ddb67c655836eed3621182c391227c6534
+  data.tar.gz: 5910b64058254718d1f0a01305ad81564fe5d0c8
+SHA512:
+  metadata.gz: febd0203a58031e1a523b0bd362a0048e1d21978ace9d05062f734b1299847c357e8f60a0131c52ce93ced70cf7c298117af54513943741a689fc10aa152719b
+  data.tar.gz: eea919c27091c2411fdbf93c1109c081f04783bfb553b59abf474da366a8653961b41c602e008df86bb93953cf7d3fe76397dd7066887e969f6b7ff53aca26e3

data/lib/breakpoint-slicer.rb

@@ -4,6 +4,6 @@ require 'breakpoint'
 Compass::Frameworks.register("breakpoint-slicer", :path => "#{File.dirname(__FILE__)}/..")
 
 module BreakpointSlicer
-  VERSION = "1.1"
-  DATE = "2013-04-09"
+  VERSION = "1.2"
+  DATE = "2013-06-20"
 end

data/stylesheets/breakpoint-slicer/_helper-functions.sass

@@ -1,3 +1,23 @@
+// Returns a correction value for the given breakpoint
+// to prevent media query overlapping.
+//
+// Relies on the global variable $slicer-anti-overlap-corrections
+// that should contain a list of allowed correction values.
+//
+// Returns either only positive or only negative value.
+//
+// anti-overlap-correction($bp, $positive: true)
+//   - $bp       : a breakpoint, e. g. 800px or 20em
+//   - $positive : whether to return only positive or only negative values
+//                 * true - return only positive correction value (default)
+//                 * false - return only negative correction value //
+@function anti-overlap-correction($bp, $positive: true)
+  @each $correction in $slicer-anti-overlap-corrections
+    @if (unit($bp) == unit($correction)) and (($correction > 0) == $positive)
+      @return $correction
+  @return 0
+
+
 // total-slices()
 //
 // Accepts no arguments.
@@ -23,14 +43,18 @@
 
   @else
 
-    // Returning the left edge of the slice
-    $left:  nth($slicer-breakpoints, $slice)
+    $left: i am declared
 
     // Special treatment of the first slice...
     @if $slice == 1
       // ...to prevent a meaningless `min-width: 0` meida query
       $left:  max-width // This is Breakpoint's syntax
 
+    @else
+      // Returning the left edge of the slice
+      $left:  nth($slicer-breakpoints, $slice)
+      $left:  $left + anti-overlap-correction($left, true)
+
     @return $left
 
 
@@ -48,8 +72,9 @@
   @else if ($slice < $min) or ($slice > $max)
     @warn "Wrong column number provided: #{$slice}. Should be between #{min} and #{$max}."
   @else
-    // Returning the right edge of the slice
-    @return nth($slicer-breakpoints, $slice + 1)
+    // Reading the right edge of the slice
+    $right-bp: nth($slicer-breakpoints, $slice + 1)
+    @return $right-bp + anti-overlap-correction($right-bp, false)
 
 
 // bp($slice)

data/stylesheets/breakpoint-slicer/_variables.sass

@@ -1,2 +1,3 @@
 // The defaults
-$slicer-breakpoints: 0 400px 600px 800px 1010px !default
+$slicer-breakpoints: 0 400px 600px 800px 1010px !default
+$slicer-anti-overlap-corrections: 1px !default

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: breakpoint-slicer
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Andrey 'lolmaus' Mikhaylov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: breakpoint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.1
 description: A very quick and efficient syntax for Breakpoint
@@ -73,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: singularitygs
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Along with Respond To, Breakpoint Slicer is an alternative syntax for Breakpoint.