diff options
author | Thiago da Silva <38531381+tsilvap@users.noreply.github.com> | 2019-04-02 22:17:29 +0300 |
---|---|---|
committer | Martijn Cuppens <martijn.cuppens@gmail.com> | 2019-04-02 22:17:29 +0300 |
commit | 62fef1741002bcea44b10e88255e6526ff7b5a7d (patch) | |
tree | 7b6c1c3059f7826fab81eaeda790021f80334d83 | |
parent | c483bca45c3501ec913e54113a4971f63a4428bb (diff) |
Declare font-size mixin for less and add tests (#129)
-rw-r--r-- | less.less | 6 | ||||
-rw-r--r-- | test/expected/test-1.css | 6 | ||||
-rw-r--r-- | test/expected/test-10.css | 7 | ||||
-rw-r--r-- | test/expected/test-2.css | 3 | ||||
-rw-r--r-- | test/expected/test-3.css | 8 | ||||
-rw-r--r-- | test/expected/test-4.css | 6 | ||||
-rw-r--r-- | test/expected/test-5.css | 6 | ||||
-rw-r--r-- | test/expected/test-6.css | 6 | ||||
-rw-r--r-- | test/expected/test-7.css | 6 | ||||
-rw-r--r-- | test/expected/test-8.css | 6 | ||||
-rw-r--r-- | test/expected/test-9.css | 7 | ||||
-rw-r--r-- | test/less/main.less | 5 | ||||
-rw-r--r-- | test/postcss/main.css | 4 | ||||
-rw-r--r-- | test/sass/main.scss | 5 | ||||
-rw-r--r-- | test/stylus/main.styl | 3 |
15 files changed, 83 insertions, 1 deletions
@@ -230,7 +230,11 @@ } } -// The responsive-font-size mixin uses RFS to rescale font sizes +// The font-size & responsive-font-size mixins use RFS to rescale font sizes +.font-size(@fs, @important: false) { + .rfs(@fs, @important); +} + .responsive-font-size(@fs, @important: false) { .rfs(@fs, @important); } diff --git a/test/expected/test-1.css b/test/expected/test-1.css index 3bed4b0..28600b3 100644 --- a/test/expected/test-1.css +++ b/test/expected/test-1.css @@ -42,3 +42,9 @@ @media (max-width: 1200px) { .selector-8 { font-size: calc(1.325rem + 0.9vw) ; } } + +.selector-9 { + font-size: 2rem; } + @media (max-width: 1200px) { + .selector-9 { + font-size: calc(1.325rem + 0.9vw) ; } } diff --git a/test/expected/test-10.css b/test/expected/test-10.css index c84a744..44c81dc 100644 --- a/test/expected/test-10.css +++ b/test/expected/test-10.css @@ -48,3 +48,10 @@ .selector-8 { font-size: calc(16px + 2vmin) ; min-width: 0vw; } } + +.selector-9 { + font-size: 32px; } + @media (max-width: 50rem), (max-height: 50rem) { + .selector-9 { + font-size: calc(16px + 2vmin) ; + min-width: 0vw; } } diff --git a/test/expected/test-2.css b/test/expected/test-2.css index 4f7e02b..318a432 100644 --- a/test/expected/test-2.css +++ b/test/expected/test-2.css @@ -24,3 +24,6 @@ .selector-8 { font-size: 2rem; } + +.selector-9 { + font-size: 2rem; } diff --git a/test/expected/test-3.css b/test/expected/test-3.css index 401fbec..0fe39d5 100644 --- a/test/expected/test-3.css +++ b/test/expected/test-3.css @@ -53,3 +53,11 @@ @media (max-width: 1200px) { .selector-8 { font-size: calc(1.325rem + 0.9vw) ; } } + +.selector-9, +.disable-responsive-font-size .selector-9, .selector-9.disable-responsive-font-size { + font-size: 2rem; } + +@media (max-width: 1200px) { + .selector-9 { + font-size: calc(1.325rem + 0.9vw) ; } } diff --git a/test/expected/test-4.css b/test/expected/test-4.css index ce0e868..4524004 100644 --- a/test/expected/test-4.css +++ b/test/expected/test-4.css @@ -42,3 +42,9 @@ @media (max-width: 1200px) { .enable-responsive-font-size .selector-8, .selector-8.enable-responsive-font-size { font-size: calc(1.325rem + 0.9vw) ; } } + +.selector-9 { + font-size: 2rem; } + @media (max-width: 1200px) { + .enable-responsive-font-size .selector-9, .selector-9.enable-responsive-font-size { + font-size: calc(1.325rem + 0.9vw) ; } } diff --git a/test/expected/test-5.css b/test/expected/test-5.css index 461b32b..57c0fc1 100644 --- a/test/expected/test-5.css +++ b/test/expected/test-5.css @@ -42,3 +42,9 @@ @media (max-width: 75em) { .selector-8 { font-size: calc(1.325rem + 0.9vw) ; } } + +.selector-9 { + font-size: 2rem; } + @media (max-width: 75em) { + .selector-9 { + font-size: calc(1.325rem + 0.9vw) ; } } diff --git a/test/expected/test-6.css b/test/expected/test-6.css index d4330c1..a3961f6 100644 --- a/test/expected/test-6.css +++ b/test/expected/test-6.css @@ -42,3 +42,9 @@ @media (max-width: 1200px) { .selector-8 { font-size: calc(1.15625rem + 1.125vw) ; } } + +.selector-9 { + font-size: 2rem; } + @media (max-width: 1200px) { + .selector-9 { + font-size: calc(1.15625rem + 1.125vw) ; } } diff --git a/test/expected/test-7.css b/test/expected/test-7.css index ae43db2..3b26cb8 100644 --- a/test/expected/test-7.css +++ b/test/expected/test-7.css @@ -42,3 +42,9 @@ @media (max-width: 1200px) { .selector-8 { font-size: calc(21.2px + 0.9vw) ; } } + +.selector-9 { + font-size: 32px; } + @media (max-width: 1200px) { + .selector-9 { + font-size: calc(21.2px + 0.9vw) ; } } diff --git a/test/expected/test-8.css b/test/expected/test-8.css index 910e037..135044a 100644 --- a/test/expected/test-8.css +++ b/test/expected/test-8.css @@ -42,3 +42,9 @@ @media (max-width: 1200px), (max-height: 1200px) { .selector-8 { font-size: calc(1.325rem + 0.9vmin) ; } } + +.selector-9 { + font-size: 2rem; } + @media (max-width: 1200px), (max-height: 1200px) { + .selector-9 { + font-size: calc(1.325rem + 0.9vmin) ; } } diff --git a/test/expected/test-9.css b/test/expected/test-9.css index c84a744..44c81dc 100644 --- a/test/expected/test-9.css +++ b/test/expected/test-9.css @@ -48,3 +48,10 @@ .selector-8 { font-size: calc(16px + 2vmin) ; min-width: 0vw; } } + +.selector-9 { + font-size: 32px; } + @media (max-width: 50rem), (max-height: 50rem) { + .selector-9 { + font-size: calc(16px + 2vmin) ; + min-width: 0vw; } } diff --git a/test/less/main.less b/test/less/main.less index e01bb61..3302d8d 100644 --- a/test/less/main.less +++ b/test/less/main.less @@ -43,3 +43,8 @@ .selector-8 { .responsive-font-size(32); } + +// font-size shorthand +.selector-9 { + .font-size(2rem); +} diff --git a/test/postcss/main.css b/test/postcss/main.css index d1027ca..1540a3b 100644 --- a/test/postcss/main.css +++ b/test/postcss/main.css @@ -33,3 +33,7 @@ .selector-8 { responsive-font-size: 32; } + +.selector-9 { + responsive-font-size: 2rem; +} diff --git a/test/sass/main.scss b/test/sass/main.scss index d3ddf2b..c92eef6 100644 --- a/test/sass/main.scss +++ b/test/sass/main.scss @@ -43,3 +43,8 @@ .selector-8 { @include responsive-font-size(32); } + +// font-size shorthand +.selector-9 { + @include font-size(2rem); +} diff --git a/test/stylus/main.styl b/test/stylus/main.styl index 8257e44..644bd9a 100644 --- a/test/stylus/main.styl +++ b/test/stylus/main.styl @@ -26,3 +26,6 @@ .selector-8 responsive-font-size(32) + +.selector-9 + responsive-font-size(2rem) |