Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #69 from nypublicradio/jkeen/background
Browse files Browse the repository at this point in the history
Add background images
  • Loading branch information
jkeen committed Nov 20, 2019
2 parents 01f2777 + 1925b59 commit 69ec9e9
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 1 deletion.
27 changes: 26 additions & 1 deletion app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,32 @@ body.ember-application{
font-family: $font-body;
font-weight: normal;
line-height: 1.0;
background-color: $water-blue;

background: $water-blue url(/images/backgrounds/background-desktop.png) no-repeat scroll left top;
background-size: 100% 700px;

@include media("retina2x") {
background: $water-blue url(/images/backgrounds/background-desktop@2x.png) no-repeat scroll left top;
background-size: 100% 700px;
}
@include media("retina3x") {
background: $water-blue url(/images/backgrounds/background-desktop@3x.png) no-repeat scroll left top;
background-size: 100% 700px;
}

@include media("<medium") {
background: $water-blue url(/images/backgrounds/background-mobile.png) no-repeat scroll left top;
background-size: 100% auto;

@include media("retina2x") {
background: $water-blue url(/images/backgrounds/background-mobile@2x.png) no-repeat scroll left top;
background-size: 100% auto;
}
@include media("retina3x") {
background: $water-blue url(/images/backgrounds/background-mobile@3x.png) no-repeat scroll left top;
background-size: 100% auto;
}
}
}

button {
Expand Down
9 changes: 9 additions & 0 deletions app/styles/vars/_tools.sg-updates.scss
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ $breakpoints: (
'xxxlarge': $xxxlarge
);

$media-expressions: (
'screen': 'screen',
'print': 'print',
'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)'
);

/**
* Animation
Expand Down
Binary file added public/images/backgrounds/background-desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/backgrounds/background-desktop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/backgrounds/background-mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 69ec9e9

Please sign in to comment.