susy 2.2.0.beta.2 → 2.2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d0591f512412a10d2cc0d8a9bb0daf2b2161fa
-  data.tar.gz: adfd26326c13e5af97efbf4386078be3739717d5
+  metadata.gz: 360d88c3ff882b9046a62354b8e152bdedf3b970
+  data.tar.gz: 5869cbf765871085cc6cf46d46f69a5a7933dc4b
 SHA512:
-  metadata.gz: 2fb29b9a8c512387fc3a8192d566c9f56a28255a0efe52cb644045766f9c1accfebcccecb821510088ea5d62b133496c2531d40e076a981ade61af257000d43e
-  data.tar.gz: 5518f798611cb3a6d9dbdde2b307cd61fdaacdb35a944c1e5766b4b7760765557d44bf6c36aae7cdb0f2371820760700719359f126ee93e9b481b0c2f440cf94
+  metadata.gz: 7dc1c83c77df18ff1287003fa7b9cbb93784a4e2a010810cd8d1d3a93e768731539e633b5a3da1fc287d05a6a3554391cfdf6715040f97075ef43051c0265d79
+  data.tar.gz: ebb8a4311e7f23bfeb7145eef1991c4aeda8e03ccd4861135f6ae46713a6f87aec050cebcc5887a5e51db63f8c1460f719ab6b3c6bf7574ee29a9d78aca57a49

data/VERSION

@@ -1 +1 @@
-2.2.0.beta.1
+2.2.0.beta.2

data/docs/changelog.rst

@@ -4,6 +4,11 @@ Changelog
 2.2.0 - UNRELEASED
 ------------------
 
+- Add global ``$susy-breakpoints`` map for creating named breakpoints.
+- Add internal media-query support for ``susy-breakpoint``
+  without requiring the Breakpoint plugin.
+- ``susy-breakpoint`` mixin no longer requires ``$layout`` argument.
+  By default, no changes will be made to your existing layout.
 - Update ``global-box-sizing`` and the legacy ``border-box-sizing``
   mixins to optionally take another argument, ``$inherit``. This new
   argument is a boolean value that defaults to ``false``, meaning the

data/sass/susy/language/susy/_breakpoint-plugin.scss

@@ -1,6 +1,7 @@
 // Breakpoint Integration
 // ======================
-// REQUIRES Breakpoint: http://breakpoint-sass.com/
+
+$susy-breakpoints: ();
 
 
 // Susy Breakpoint
@@ -11,16 +12,141 @@
 // - $no-query  : <breakpoint $no-query>
 @mixin susy-breakpoint(
   $query,
-  $layout,
+  $layout: false,
   $no-query: false
 ) {
-  @if mixin-exists(breakpoint) {
-    @include breakpoint($query, $no-query) {
+  @include susy-mq($query, $no-query) {
+    @if $layout {
       @include with-layout($layout) {
         @content;
       }
+    } @else {
+      @content;
     }
+  }
+}
+
+// Media Queries
+// -------------
+// Check for an existing breakpoint mixin, or provide a simple fallback.
+// - $query: <min-width> [<max-width>] | <property> <value>
+// - $no-query: <boolean> | <selector>
+@mixin susy-mq(
+  $query,
+  $no-query: false
+) {
+  @if susy-support(breakpoint, (mixin: breakpoint), $warn: false) {
+    @include breakpoint($query, $no-query);
   } @else {
-    @warn "Susy-breakpoint requires the Breakpoint plugin (http://breakpoint-sass.com/)";
+    @media #{susy-build-breakpoint($query)} {
+      @content;
+    }
+
+    @if $no-query {
+      @if type-of($no-query) == string {
+        #{$no-query} & {
+          @content;
+        }
+      } @else {
+        @content;
+      }
+    }
   }
 }
+
+
+// Get Media
+// ---------
+// Return a named media-query from $susy-breakpoints.
+// - $name: <key>
+@function susy-get-media(
+  $name
+) {
+  $query: map-get($susy-breakpoints, $name);
+
+  @if map-has-key($susy-breakpoints, $query) {
+    $query: susy-get-media($query);
+  }
+
+  @if not($query) {
+    @warn '"#{$name}" is not an option in $susy-breakpoints.';
+  }
+
+  @return $query;
+}
+
+
+// Parse Breakpoint
+// ----------------
+// Return a formatted media-query
+// - $query: <min-width> [<max-width>] | <property> <value>
+@function susy-parse-breakpoint(
+  $query
+) {
+  $output: (
+    min-width: null,
+    max-width: null,
+  );
+
+  @if type-of($query) == map {
+    @return $query;
+  } @else if map-has-key($susy-breakpoints, $query) {
+    @return susy-parse-breakpoint(susy-get-media($query));
+  }
+
+  $i: 1;
+  @while $i <= length($query) {
+    $this: nth($query, $i);
+
+    @if type-of($this) == map {
+      $output: map-merge($output, $this);
+    } @else if type-of($this) == string {
+      $i: $i + 1;
+      @if $i > length($query) {
+        @warn 'No value supplied for #{$this}';
+      } @else {
+        $value: nth($query, $i);
+        $output: map-merge($output, ($this: $value));
+      }
+    } @else if type-of($this) == list {
+      $prop: nth($this, 1);
+      $value: nth($this, 2);
+      $output: map-merge($output, ($prop: $value));
+    } @else if type-of($this) == number {
+      $prop: null;
+      @each $key, $value in $output {
+        @if not($value) and not($prop) {
+          $prop: $key;
+        }
+      }
+      $output: map-merge($output, ($prop: $this));
+    }
+
+    $i: $i + 1;
+  }
+
+  @return $output;
+}
+
+
+// Build Breakpoint
+// ----------------
+
+@function susy-build-breakpoint(
+  $query
+) {
+  $query: susy-parse-breakpoint($query);
+  $return: null;
+
+  @each $prop, $value in $query {
+    @if $value {
+      @if $return {
+        $return: '#{$return} and (#{$prop}: #{$value})';
+      } @else {
+        $return: '(#{$prop}: #{$value})';
+      }
+    }
+  }
+
+  @return $return;
+}

data/sass/susy/output/_support.scss

@@ -1,9 +1,9 @@
 // Susy Browser Support
 // ====================
 
+@import "support/support";
 @import "support/prefix";
 @import "support/background";
 @import "support/box-sizing";
 @import "support/rem";
 @import "support/clearfix";
-@import "support/support";

data/sass/susy/output/support/_support.scss

@@ -8,6 +8,7 @@
     clearfix: false,
     background-image: true,
     background-options: false,
+    breakpoint: true,
     box-sizing: true,
     rem: true,
   ),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.2.0.beta.2
+  version: 2.2.0.beta.3
 platform: ruby
 authors:
 - Eric Suzanne