From c58b1b7fb74e8db0d676e2e543b8389a7017b855 Mon Sep 17 00:00:00 2001
From: Jon Grenning <jon.g@shopify.com>
Date: Mon, 16 Mar 2015 15:58:50 -0400
Subject: [PATCH 1/2] make the at-query more intuitive for min-max calls

---
 assets/timber.scss.liquid | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid
index f05341557..b93ba7b5a 100755
--- a/assets/timber.scss.liquid
+++ b/assets/timber.scss.liquid
@@ -217,7 +217,9 @@ $socialIconFontStack: 'icons';
 ==============================================================================*/
 $min: min-width;
 $max: max-width;
-@mixin at-query ($constraint, $viewport1, $viewport2:null) {
+@mixin at-query ($constraint_, $viewport1_, $viewport2_:null) {
+ $constraint: $constraint_; $viewport1:$viewport1_; $viewport2:$viewport2_;
+  @if type-of($constraint_) == number { $viewport1 : $constraint_; $viewport2 : $viewport1_; $constraint : null; }
   @if $constraint == $min {
     @media screen and ($min: $viewport1) {
       @content;

From 4e8be80f69cd262adeb6cd5bdc786f953853e173 Mon Sep 17 00:00:00 2001
From: Carson Shold <carson@carsonshold.com>
Date: Wed, 18 Mar 2015 09:42:35 -0400
Subject: [PATCH 2/2] Syntax and doc link for at-query mixin

---
 assets/timber.scss.liquid | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid
index 4d2211d2a..8a89c4e7f 100755
--- a/assets/timber.scss.liquid
+++ b/assets/timber.scss.liquid
@@ -232,13 +232,16 @@ $socialIconFontStack: 'icons';
 
 /*============================================================================
   Dependency-free breakpoint mixin
-    - http://blog.grayghostvisuals.com/sass/sass-media-query-mixin/
+    - Based on http://blog.grayghostvisuals.com/sass/sass-media-query-mixin/
+    - Usage docs: http://shopify.github.io/Timber/#sass-mixins
 ==============================================================================*/
 $min: min-width;
 $max: max-width;
 @mixin at-query ($constraint_, $viewport1_, $viewport2_:null) {
- $constraint: $constraint_; $viewport1:$viewport1_; $viewport2:$viewport2_;
-  @if type-of($constraint_) == number { $viewport1 : $constraint_; $viewport2 : $viewport1_; $constraint : null; }
+ $constraint: $constraint_; $viewport1: $viewport1_; $viewport2: $viewport2_;
+  @if type-of($constraint_) == number {
+    $viewport1 : $constraint_; $viewport2 : $viewport1_; $constraint : null;
+  }
   @if $constraint == $min {
     @media screen and ($min: $viewport1) {
       @content;