Merge branch 'v1-6-1'

rafalbromirski · Sep 20, 2015 · 62fa351 · 62fa351
2 parents 30e7653 + 8f42bbc
commit 62fa351
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/_media-queries.scss b/_media-queries.scss
@@ -5,14 +5,21 @@
 //  Licensed under a MIT License
 //
 //  Version:
-//  1.6.0
+//  1.6.1
 
 // --- generator ---------------------------------------------------------------
 
-@mixin mq($media-type: 'only screen', $args...) {
+@mixin mq($args...) {
+  $media-type: 'only screen';
+  $media-type-key: 'media-type';
   $args: keywords($args);
   $expr: '';
 
+  @if map-has-key($args, $media-type-key) {
+    $media-type: map-get($args, $media-type-key);
+    $args: map-remove($args, $media-type-key);
+  }
+
   @each $key, $value in $args {
     @if $value {
       $expr: "#{$expr} and (#{$key}: #{$value})";

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "sass-mediaqueries",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "homepage": "https://github.com/paranoida/sass-mediaqueries",
   "authors": [
     "Rafal Bromirski <rafal.bromirski@gmail.com>"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sass-mediaqueries",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "homepage": "https://github.com/paranoida/sass-mediaqueries",
   "author": {
     "name": "Rafal Bromirski",