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

Proper background-size keyword support #201

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Proper background-size keyword support #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions lib/nib/image.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,18 @@
* github.com/LearnBoost/stylus/issues/1038 ... refactor when those are closed
*/

// We need this due to some weird scoping rule in Stylus. The @media selector
// does not inherit its parent scope at all.
nib-image--background-size(w = auto, h = auto)
if w in (cover contain) and h == auto
background-size: w null
else if w != auto or h != auto
background-size: w h

image(path, w = auto, h = auto, min_pixel_ratio = 1.5)

background-image: url(path)
nib-image--background-size w h

s = 'all and (-webkit-min-device-pixel-ratio:' + min_pixel_ratio + '),'
s = s + '(min--moz-device-pixel-ratio:' + min_pixel_ratio + '),'
Expand All @@ -21,6 +31,4 @@ image(path, w = auto, h = auto, min_pixel_ratio = 1.5)
ext = extname(path)
path = pathjoin(dirname(path), basename(path, ext) + '@2x' + ext)
background-image: url(path)
if w in (cover contain) and h == auto
h = null
background-size: w h
nib-image--background-size w h
24 changes: 23 additions & 1 deletion test/cases/image.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
#logo {
background-image: url("/images/branding/[email protected]");
background-size: auto auto;
}
}
#logo {
background-image: url("/images/branding/logo.main.png");
background-size: 50px 100px;
}
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
#logo {
Expand All @@ -18,6 +18,27 @@
}
#logo {
background-image: url("/images/branding/logo.main.png");
background-size: auto 100px;
}
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
#logo {
background-image: url("/images/branding/[email protected]");
background-size: auto 100px;
}
}
#logo {
background-image: url("/images/branding/logo.main.png");
background-size: 50px auto;
}
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
#logo {
background-image: url("/images/branding/[email protected]");
background-size: 50px auto;
}
}
#logo {
background-image: url("/images/branding/logo.main.png");
background-size: cover;
}
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
#logo {
Expand All @@ -27,6 +48,7 @@
}
#logo {
background-image: url("/images/branding/logo.main.png");
background-size: contain;
}
@media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) {
#logo {
Expand Down
6 changes: 6 additions & 0 deletions test/cases/image.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
#logo
image: '/images/branding/logo.main.png' 50px 100px

#logo
image: '/images/branding/logo.main.png' auto 100px

#logo
image: '/images/branding/logo.main.png' 50px auto

#logo
image: '/images/branding/logo.main.png' cover

Expand Down