Change media expressions syntax and bump to v1.4.1

eduardoboucas · Jul 19, 2015 · 660c819 · 660c819
1 parent 16f7b5b
commit 660c819
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "include-media",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "homepage": "https://github.com/eduardoboucas/import-media",
   "authors": [
     "Eduardo Boucas <[email protected]>"

diff --git a/dist/_include-media.scss b/dist/_include-media.scss
@@ -8,7 +8,7 @@
 //    |_|_| |_|\___|_|\__,_|\__,_|\___| |_| |_| |_|\___|\__,_|_|\__,_|
 //
 //      Simple, elegant and maintainable media queries in Sass
-//                        v1.4.0
+//                        v1.4.1
 //
 //                http://include-media.com
 //
@@ -46,10 +46,7 @@ $breakpoints: (
 ///
 /// @example scss - Creates a static expression with logical disjunction (OR operator)
 ///  $media-expressions: (
-///    'retina2x': (
-///      '(-webkit-min-device-pixel-ratio: 2)',
-///      '(min-resolution: 192dpi)'
-///    )
+///    'retina2x': '(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)'
 ///  );
 ///
 $media-expressions: (
@@ -58,14 +55,8 @@ $media-expressions: (
   'handheld': 'handheld',
   'landscape': '(orientation: landscape)',
   'portrait': '(orientation: portrait)',
-  'retina2x': (
-    '(-webkit-min-device-pixel-ratio: 2)',
-    '(min-resolution: 192dpi)'
-  ), 
-  'retina3x': (
-    '(-webkit-min-device-pixel-ratio: 3)',
-    '(min-resolution: 350dpi)'
-  )
+  'retina2x': '(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)',
+  'retina3x': '(-webkit-min-device-pixel-ratio: 3), (min-resolution: 350dpi)'
 ) !default;
 
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "include-media",
   "name": "include-media",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Simple, elegant and maintainable media queries in Sass",
   "repository": {
     "type": "git",

diff --git a/src/_config.scss b/src/_config.scss
@@ -26,10 +26,7 @@ $breakpoints: (
 ///
 /// @example scss - Creates a static expression with logical disjunction (OR operator)
 ///  $media-expressions: (
-///    'retina2x': (
-///      '(-webkit-min-device-pixel-ratio: 2)',
-///      '(min-resolution: 192dpi)'
-///    )
+///    'retina2x': '(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)'
 ///  );
 ///
 $media-expressions: (
@@ -38,14 +35,8 @@ $media-expressions: (
   'handheld': 'handheld',
   'landscape': '(orientation: landscape)',
   'portrait': '(orientation: portrait)',
-  'retina2x': (
-    '(-webkit-min-device-pixel-ratio: 2)',
-    '(min-resolution: 192dpi)'
-  ), 
-  'retina3x': (
-    '(-webkit-min-device-pixel-ratio: 3)',
-    '(min-resolution: 350dpi)'
-  )
+  'retina2x': '(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)',
+  'retina3x': '(-webkit-min-device-pixel-ratio: 3), (min-resolution: 350dpi)'
 ) !default;