Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two dimensional fix #225

Merged
merged 3 commits into from
Feb 29, 2020
Merged

Two dimensional fix #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14eb5e3
Two dimensional fix
benjaminpreiss Feb 28, 2020
5325c20
Add additional test
MartijnCuppens Feb 28, 2020
c5c4cec
Merge branch 'master' into two-dimensional-fix
MartijnCuppens Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion less.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
._rfs-render-media-query () {
& when (@rfs-two-dimensional) {
& when (@rfs-mode = "min-media-query") {
@media (min-width: @max-width), (min-height: @max-width) {
@media (min-width: @max-width) and (min-height: @max-width) {
@{property}: @valueResult;
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/rfs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,11 @@ module.exports = class {
};

const dimPrefix = (this.opts.mode === 'min-media-query') ? 'min' : 'max';
const dimConnector = (this.opts.mode === 'min-media-query') ? ' and' : ',';
const breakpoint = (this.opts.breakpointUnit === 'px') ? this.opts.breakpoint : this.opts.breakpoint / this.opts.remValue;

if (this.opts.twoDimensional) {
mediaQuery.params = `(${dimPrefix}-width: ${breakpoint}${this.opts.breakpointUnit}), (${dimPrefix}-height: ${breakpoint}${this.opts.breakpointUnit})`;
mediaQuery.params = `(${dimPrefix}-width: ${breakpoint}${this.opts.breakpointUnit})${dimConnector} (${dimPrefix}-height: ${breakpoint}${this.opts.breakpointUnit})`;
} else {
mediaQuery.params = `(${dimPrefix}-width: ${breakpoint}${this.opts.breakpointUnit})`;
}
Expand Down
11 changes: 9 additions & 2 deletions scss.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,15 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
// Internal mixin used to determine which media query needs to be used
@mixin _rfs-media-query {
@if $rfs-two-dimensional {
@media (#{$rfs-mq-property-width}: #{$rfs-mq-value}), (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
@content;
@if $rfs-mode == max-media-query {
@media (#{$rfs-mq-property-width}: #{$rfs-mq-value}), (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
@content;
}
}
@else {
@media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) and (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
@content;
}
}
}
@else {
Expand Down
8 changes: 6 additions & 2 deletions stylus.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,12 @@ _rfs-media-query-rule()
// Internal mixin used to determine which media query needs to be used
_rfs-media-query()
if $rfs-two-dimensional
@media ({$rfs-mq-property-width}: $rfs-mq-value), ({$rfs-mq-property-height}: $rfs-mq-value)
{block}
if $rfs-mode == min-media-query
@media ({$rfs-mq-property-width}: $rfs-mq-value) and ({$rfs-mq-property-height}: $rfs-mq-value)
{block}
else
@media ({$rfs-mq-property-width}: $rfs-mq-value), ({$rfs-mq-property-height}: $rfs-mq-value)
{block}
else
@media ({$rfs-mq-property-width}: $rfs-mq-value)
{block}
Expand Down
46 changes: 23 additions & 23 deletions test/expected/test-10.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
font-size: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-1 {
font-size: 32px;
}
Expand All @@ -14,7 +14,7 @@
font-size: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-2 {
font-size: 32px;
}
Expand All @@ -24,7 +24,7 @@
font-size: calc(16px + 2vmin) !important;
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-3 {
font-size: 32px !important;
}
Expand All @@ -34,7 +34,7 @@
font-size: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-4 {
font-size: 32px;
}
Expand All @@ -53,7 +53,7 @@
font-size: calc(15.2px + 1.6vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-7 {
font-size: 28px;
}
Expand All @@ -64,7 +64,7 @@
flex: 0 999 calc(112px + 50vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-8 {
flex: 0 999 512px;
}
Expand All @@ -74,7 +74,7 @@
padding: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-9 {
padding: 32px;
}
Expand All @@ -84,7 +84,7 @@
padding: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-10 {
padding: 32px;
}
Expand All @@ -94,7 +94,7 @@
padding-top: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-11 {
padding-top: 32px;
}
Expand All @@ -104,7 +104,7 @@
padding-right: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-12 {
padding-right: 32px;
}
Expand All @@ -114,7 +114,7 @@
padding-bottom: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-13 {
padding-bottom: 32px;
}
Expand All @@ -124,7 +124,7 @@
padding-left: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-14 {
padding-left: 32px;
}
Expand All @@ -134,7 +134,7 @@
margin: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-15 {
margin: 32px;
}
Expand All @@ -144,7 +144,7 @@
margin-top: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-16 {
margin-top: 32px;
}
Expand All @@ -154,7 +154,7 @@
margin-right: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-17 {
margin-right: 32px;
}
Expand All @@ -164,7 +164,7 @@
margin-bottom: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-18 {
margin-bottom: 32px;
}
Expand All @@ -174,7 +174,7 @@
margin-left: calc(16px + 2vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-19 {
margin-left: 32px;
}
Expand All @@ -184,7 +184,7 @@
margin: calc(16px + 2vmin) calc(19.2px + 3.6vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-20 {
margin: 32px 48px;
}
Expand All @@ -194,7 +194,7 @@
margin: calc(16px + 2vmin) calc(19.2px + 3.6vmin) !important;
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-21 {
margin: 32px 48px !important;
}
Expand All @@ -208,7 +208,7 @@
margin: 0 calc(19.2px + 3.6vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-23 {
margin: 0 48px;
}
Expand All @@ -218,7 +218,7 @@
box-shadow: 0 0 calc(16px + 2vmin) #f00, 0 0 calc(19.2px + 3.6vmin) #0f0;
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-24 {
box-shadow: 0 0 32px #f00, 0 0 48px #0f0;
}
Expand All @@ -228,7 +228,7 @@
--value: calc(19.2px + 3.6vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-25 {
--value: 48px;
}
Expand All @@ -242,7 +242,7 @@
margin: calc(-19.2px - 3.6vmin);
min-width: 0vw;
}
@media (min-width: 50rem), (min-height: 50rem) {
@media (min-width: 50rem) and (min-height: 50rem) {
.selector-27 {
margin: -48px;
}
Expand Down
Loading