susy 2.2.0.rc.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe693f6177ba52203efd47d5f71251e92d84129
-  data.tar.gz: 9d79f60e34f216a9cd82e828c0016fc1fd8ca768
+  metadata.gz: aeff89a5dbdfc5672ff554689e6afbcdaa724e45
+  data.tar.gz: 9be2961b9570ce56d91f8989427a9b8be393caf5
 SHA512:
-  metadata.gz: 02c575f8088039ab87672e6e0dd757d5b083fa550652810d1de5518dae716a0c323085478522667e551cba4321695b544d8e08d82f8b5bd4976a106df7df5e0f
-  data.tar.gz: 8b8586e57411d4f6f42bbebd4fd1473c81b1ea41d54c07f2eccfc7cf4b70d8c02f71d784d3c6be4638f639e25ca72bcd19a6451c1e1a4622eac2d9c910c674b7
+  metadata.gz: 2770325f1fcede0dd34d97ae023c524cfb379b9dbc24c01e145320615dcbb4cd2f0e9ee09b8ff75e750d9173bb76954ff322d13864efff92c3378d3b493689cd
+  data.tar.gz: e36108df39a377d723e61895b5bd1989e0b99c63378abfa5416aab6530ae1f1eb96dc967f78079f37179dc23a37cb45af0d5cf650a870be0e165f1d9d8a6d6f0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Eric M. Suzanne
+Copyright (c) 2015, Eric M. Suzanne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/VERSION

@@ -1 +1 @@
-2.2.0.rc.1
+2.2.0

data/docs/changelog.rst

@@ -1,10 +1,11 @@
 Changelog
 =========
 
-2.2.0 - UNRELEASED
-------------------
+2.2.1 - Jan 14 2015
+-------------------
 
-- Add global ``$susy-breakpoints`` map for creating named breakpoints.
+- Release npm ``susy`` package.
+- Add global ``$susy-media`` 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.

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

@@ -1,21 +1,24 @@
 // Breakpoint Integration
 // ======================
 
-$susy-breakpoints: ();
+$susy-media: () !default;
+$susy-media-fallback: false !default;
+
+$_susy-media-context: ();
 
 
 // Susy Breakpoint
 // ---------------
-// Change grids at different mediaqueries.
-// - $query     : <breakpoint $query>
+// Change grids at different media query breakpoints.
+// - $query     : <min-width> [<max-width>] | <property> <value> | <map>
 // - $layout    : <settings>
-// - $no-query  : <breakpoint $no-query>
+// - $no-query  : <boolean> | <selector>
 @mixin susy-breakpoint(
   $query,
   $layout: false,
-  $no-query: false
+  $no-query: $susy-media-fallback
 ) {
-  @include susy-mq($query, $no-query) {
+  @include susy-media-router($query, $no-query) {
     @if $layout {
       @include with-layout($layout) {
         @content;
@@ -26,129 +29,153 @@ $susy-breakpoints: ();
   }
 }
 
-// Media Queries
-// -------------
-// Check for an existing breakpoint mixin, or provide a simple fallback.
+
+// Susy Media
+// ----------
 // - $query: <min-width> [<max-width>] | <property> <value>
 // - $no-query: <boolean> | <selector>
-@mixin susy-mq(
+@mixin susy-media(
+  $query,
+  $no-query: $susy-media-fallback
+) {
+  $old-context: $_susy-media-context;
+  $name: if(map-has-key($susy-media, $query), $query, null);
+  $query: susy-get-media($query);
+  $query: susy-parse-media($query);
+
+  @include susy-media-context($query, $name);
+
+  @if $no-query and type-of($no-query) != string {
+    @content;
+  } @else {
+    @media #{susy-render-media($query)} {
+      @content;
+    }
+
+    @if type-of($no-query) == string {
+      #{$no-query} & {
+        @content;
+      }
+    }
+  }
+
+  @include susy-media-context($old-context, $clean: true);
+}
+
+
+// Media Router
+// ------------
+// Rout media arguments to the correct mixin.
+@mixin susy-media-router(
   $query,
-  $no-query: false
+  $no-query: $susy-media-fallback
 ) {
   @if susy-support(breakpoint, (mixin: breakpoint), $warn: false) {
     @include breakpoint($query, $no-query) {
       @content;
     }
   } @else {
-    @media #{susy-build-breakpoint($query)} {
+    @include susy-media($query, $no-query) {
       @content;
     }
+  }
+}
 
-    @if $no-query {
-      @if type-of($no-query) == string {
-        #{$no-query} & {
-          @content;
-        }
-      } @else {
-        @content;
-      }
-    }
+
+// Update Context
+// -------------
+// Set the new media context
+@mixin susy-media-context(
+  $query,
+  $name: null,
+  $clean: false
+) {
+  $query: map-merge((name: $name), $query);
+
+  @if $clean {
+    $_susy-media-context: $query !global;
+  } @else {
+    $_susy-media-context: map-merge($_susy-media-context, $query) !global;
+  }
+}
+
+
+// Media Context
+// -------------
+// Return the full media context, or a single media property (e.g. min-width)
+@function susy-media-context(
+  $property: false
+) {
+  @if $property {
+    @return map-get($_susy-media-context, $property);
+  } @else {
+    @return $_susy-media-context;
   }
 }
 
 
 // Get Media
 // ---------
-// Return a named media-query from $susy-breakpoints.
+// Return a named media-query from $susy-media.
 // - $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.';
+  @if map-has-key($susy-media, $name) {
+    $name: map-get($susy-media, $name);
+    $name: susy-get-media($name);
   }
 
-  @return $query;
+  @return $name;
 }
 
 
-// Parse Breakpoint
-// ----------------
-// Return a formatted media-query
-// - $query: <min-width> [<max-width>] | <property> <value>
-@function susy-parse-breakpoint(
+// Render Media
+// ------------
+// Build a media-query string from various media settings
+@function susy-render-media(
   $query
 ) {
-  $output: (
-    min-width: null,
-    max-width: null,
-  );
+  $output: null;
+  @each $property, $value in $query {
+    $string: 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));
+    @if $property == media {
+      $string: $value;
+    } @else {
+      $string: '(#{$property}: #{$value})';
     }
 
-    $i: $i + 1;
+    $output: if($output, '#{$output} and #{$string}', $string);
   }
 
   @return $output;
 }
 
 
-// Build Breakpoint
-// ----------------
-
-@function susy-build-breakpoint(
+// Parse Media
+// -----------
+// Return parsed media-query settings based on shorthand
+@function susy-parse-media(
   $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})';
-      }
+  $mq: null;
+  @if type-of($query) == map {
+    $mq: $query;
+  } @else if type-of($query) == number {
+    $mq: (min-width: $query);
+  } @else if type-of($query) == list and length($query) == 2 {
+    @if type-of(nth($query, 1)) == number {
+      $mq: (
+        min-width: min($query...),
+        max-width: max($query...),
+      );
+    } @else {
+      $mq: (nth($query, 1): nth($query, 2));
     }
+  } @else {
+    $mq: (media: '#{$query}');
   }
 
-  @return $return;
+  @return $mq;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Eric Suzanne
@@ -136,9 +136,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '1.2'
 requirements: []
 rubyforge_project: susy
 rubygems_version: 2.1.10