Skip to content

Commit

Permalink
Merge branch 'release/v2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan503 committed Dec 2, 2017
2 parents bed3c21 + 9dba40c commit 5e127af
Show file tree
Hide file tree
Showing 85 changed files with 21,187 additions and 101 deletions.
5 changes: 5 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

{
"presets": ["es2015"],
"plugins": [["add-module-exports"]]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ logs
*.log
npm-debug.log*

node_modules
node_modules
tmp
13 changes: 13 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Logs
logs
*.log
npm-debug.log*

node_modules
src
tmp
gulp
.babelrc
.gitignore
gulpfile.babel.js

154 changes: 150 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# mq-scss

An extremely powerful but easy to use Sass media query mixin
An extremely powerful but easy to use Sass media query mixin that allows you to create almost any media query you can imagine.

This media query mixin is a powerful tool that lets you easily create far more complex media queries than you would have ever attempted to do with plain css. It also makes your code far easier to maintain through it's ability to take simple media query variables.

If you enjoy using mq-scss, try my new [mq-js](https://www.npmjs.com/package/mq-js) npm module. This allows you to use mq-scss style media queries inside your JavaScript files.
I've set up a [test/demo site](https://dan503.github.io/mq-scss/). It primarily exists for testing but it does a pretty decent job of demoing what mq-scss can do as well.

If you enjoy using mq-scss, also try out my [mq-js](https://www.npmjs.com/package/mq-js) npm module. This allows you to use mq-scss style media queries inside your JavaScript files.

## Contents

Expand All @@ -29,9 +31,13 @@ If you enjoy using mq-scss, try my new [mq-js](https://www.npmjs.com/package/mq-
* [Media Query `plus` statements](#media-query-plus-statements)
* [**!IMPORTANT!** limitations of `plus`](#important-limitations-of-plus)
* [Defining media types](#defining-media-types)
* [Media only queries](#media-only-queries)
* [The `not` media type](#the-not-media-type)
* [em conversion](#em-conversion)
* [Defining breakpoints](#defining-breakpoints)
* [Debug](#debug)
* [Bonus retina display mixin](#bonus-retina-display-mixin)
* [For contributors](#for-contributors)
* [Change Log](#change-log)

## Installation
Expand All @@ -49,7 +55,7 @@ Import mq-scss at the top of your main Sass file (note that the exact path will
## Basic usage

``````scss
@include mq($range, $breakpoint-1 [, $breakpoint-2]){ @content }
@include mq($range, $breakpoint_1 [, $breakpoint_2] [, $mediaType] [, $debug]){ @content }
``````

### Min/Max width
Expand Down Expand Up @@ -270,6 +276,8 @@ There are 2 types of ratio based media queries, "aspect-ratio" (shortened to jus

Ratio based media queries are mostly useful for when you have sites that have displays that take up the full screen. Displays like this tend to need media queries that understand both the users screen height and width at the same time. You may need to combine the ratio based media query with a more traditional pixel based media query for it to have the greatest effect. Read the [Media Query `plus` statements](#media-query-plus-statements) section for more details on how to do that.

Unlike `min-width` and `min-height`, `min-ratio` will actually conflict with `max-ratio`. To learn how to avoid this, read through the [`not` media type](#the-not-media-type) section.

### Full list of media query ranges

@include mq([range], XXX, YYY){ /*styles*/ }
Expand Down Expand Up @@ -862,7 +870,7 @@ $mq: (
}
`````````````
An important thing to note about media types and `plus` statements. Only the media type that is defined at the start of the plus statement will be honoured. All other media types will be ignored.
An important thing to note about media types and `plus` statements. Only the media type that is defined at the _start_ of the plus statement will be honoured. All other media types will be ignored.
`````````````scss
// SCSS
Expand Down Expand Up @@ -898,6 +906,93 @@ An important thing to note about media types and `plus` statements. Only the med
}
`````````````
### Media only queries
This was introduced in version 2.1.0. This is now a completely valid mq-scss statement:
````scss
@include mq('print'){
body { color: #000; }
}
````
````css
/* output css */
@media print {
body { color: #000; }
}
````
Using it in that way is kind of counter productive since it takes more characters to type it out than the raw css version. Where the strength comes is from utilizing it in `or` and `plus` statements.
Here is a `plus` statement example:
````scss
$MQ-plusExample: 'screen' plus (inside, 600px, 1000px);
@include mq($MQ-plusExample){
body { color: #000; }
}
````
````css
/* output css */
@media screen and (max-width: 1000px) and (min-width: 601px) {
body { color: #000; }
}
````
This lets you place `'screen'` at the start and join it to the rest of the query with a `plus` statement. This makes it feel much closer to real css while still keeping all the advantages of the mq-scss syntax. Remember that `plus` statements are not compatible with `outside` range types though so those still need to use the v2.0.0 syntax.
Here is an `or` example.
````scss
$MQ-orExample: (
(min, 1200px),
'print'
);
@include mq($MQ-orExample){
body { color: #000; }
}
````
````css
/* output css */
@media (min-width: 1201px), print {
body { color: #000; }
}
````
The use case in this example is that you always want the print styles to be based on the desktop version of the site even if printing from a mobile device. By placing `'print'` on it's own in the or statement, it will always print based on the desktop styles no matter what the current screen size is.
### The `not` media type
`'not'` is an interesting media type. It was introduced in v2.1.0 as a short-hand for `not screen` in mq-scss (`@media not (max-width: 600px){}` is actually invalid css).
`'not'` will essentially invert the media query. You could use this for helping you write counter queries however I would caution against this. In general, using `'not'` is fine. However, if you try and nest another media query inside of it, or you nest the `'not'` statement inside a different media query, Sass can output some very odd and unexpected results. This is the reason version 1.0.0 of mq-scss couldn't support nested `outside` statements. It was essentially using `not inside` to produce the media query.
There is at least one very good use case for using the `'not'` media type though. Take a look at the Ratio section of the [mq-scss test site](https://dan503.github.io/mq-js/#ratio) and resize your browser to exactly 800px wide by 400px tall. You will notice that they all return `true` since your screen is at exactly a `2 / 1` ratio and they all share that `2 / 1` ratio in their media query. Increase or decrease the size of your window by just a single pixel and you will see some of them swap to returning false.
I couldn't build protection against this into the core mq-scss mixin since I couldn't just add +1 pixel to a ratio like I could with width and height. I also didn't want to use `'not'` in the core mixin since that would prevent all cases of `min-ratio` from being compatible with media query nesting. There is nothing stopping you from using `'not'` to solve this issue yourself though.
In order to use a `min-ratio` that works in the same sort of way that `min-height` and `min-width` work, you actually need to use `'not'` in combination with a `max-ratio` statement.
````scss
//equivalent to (min-ratio, '2 / 1') but without the 1px sour spot
@include mq(max-ratio, '2 / 1', 'not') {
body { color: #000; }
}
//same as above but formatted to place the 'not' at the start
@include mq('not' plus (max-ratio, '2 / 1')) {
body { color: #000; }
}
````
````css
/* output css for both */
@media not screen and (max-aspect-ratio: 2 / 1) {
body { color: #000; }
}
````
## em conversion
Pixel based media queries can actually appear incorrectly when zooming on some browsers (it's particularly infamous in Safari on Mac).
Expand Down Expand Up @@ -939,6 +1034,40 @@ $BP-page: 1200px;
}
`````````
## Debug
As of version 2.1.0, you can now access some debug information. You have 2 options available to you; local, and global.
The easiest option is using the local method. Simply set the `$debug` property of the mixin to `true` and you will be given access to the debug information.
````scss
.element {
//Show debug info for only this media query
@include mq(inside, 600px, 1000px, $debug: true){
//styles go here
}
}
````
That example would produce a log in your console that looks like this:
````
mq-scss/_mq.scss:378 DEBUG: inside
mq-scss/_mq.scss:397 DEBUG: inline_mq_values (range: inside, breakpoint_1: 600px, breakpoint_2: 1000px, mediaType: false, mediaO
nly: false)
mq-scss/_mq.scss:248 DEBUG: get_values_result (range: inside, breakpoint_1: 600px, breakpoint_2: 1000px, media: "")
mq-scss/_mq.scss:90 DEBUG: calculateMQ (range: inside, breakpoint_1: 1000px, breakpoint_2: 600px, mediaType: false)
mq-scss/_mq.scss:421 DEBUG: !!!!! FINAL OUTPUT: @media (max-width: 1000px) and (min-width: 601px)
````
The other option is to turn debugging on globally. Set `$mq-debug` to `true` before the mixin import statement and it will produce debug information for every media query you have created with mq-scss across the entire site. I don't find this as useful as debugging individual mq-scss media queries but it's there if you want it.
````scss
//Show debug info for all media-queries across the entire site
$mq-debug: true;
@import '../node_modules/mq-scss/_mq';
````
## Bonus retina display mixin
I've also added a retina display mixin for detecting retina display devices
Expand Down Expand Up @@ -986,10 +1115,27 @@ To create this css:
}
````````
## For contributors
If you wish to contribute to mq-scss, version 2.1.0+ comes with a testing environment. To access the testing environment:
1. Checking out the [GitHub repository](https://github.com/Dan503/mq-scss)
2. Run `npm install`
3. Run `gulp --open`
I plan to eventually create proper automated unit tests. This is better than nothing though.
## Change log
This change log only covers major changes to the mixin. Due to how npm works, things like edits to the readme file require releasing whole new versions of the module to publish the edits. Those sorts of releases are not listed here.
### v2.1.0
- Added the ability to debug mq statements by setting either the local `$debug` setting or the global `$mq-debug` setting to `true`.
- Now supports media type only statements
- Added a proper testing/demo environment to the repository (check out repo > `npm i` > `gulp --open`)
- Added support for `not` as a short-hand for `not screen` media types.
### v2.0.0
- Added the ability to define custom media types for individual mq statements.
Expand Down
Loading

0 comments on commit 5e127af

Please sign in to comment.