From eecdb8e0c11c8ed07a228d82a83fa230c04c9909 Mon Sep 17 00:00:00 2001 From: Dirk Voss Date: Wed, 8 Oct 2014 11:57:06 +0200 Subject: [PATCH] (#3) Styling: Added support for retina images --- .../default.theme/css/application.css | 18 +++++++++--------- .../application/default.theme/scss/_base.scss | 14 ++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/application/layouts/application/default.theme/css/application.css b/application/layouts/application/default.theme/css/application.css index 85e18b7..38eec1e 100644 --- a/application/layouts/application/default.theme/css/application.css +++ b/application/layouts/application/default.theme/css/application.css @@ -125,7 +125,7 @@ a:focus { display: block; height: 60px; width: 257px; - background: url("../images/laxarjs_logo.png") no-repeat right; + background: url("../images/laxarjs_logo.png") no-repeat right/100%; } .app-no-selection, @@ -135,11 +135,13 @@ a:focus { } .app-flower { + float: right; margin-top: 40px; margin-right: 20px; margin-bottom: 40px; height: 300px; - background: url("../images/pot_flower.png") no-repeat right; + width: 127px; + background: url("../images/pot_flower.png") no-repeat right/100%; } .app-footer { @@ -207,12 +209,10 @@ a, } } -@media only screen and (-webkit-min-device-pixel-ratio: 2) { - .app-logo { - background: url("../images/laxarjs_logo@2x.png") no-repeat right; - } +.app-logo { + background: url("../images/laxarjs_logo@2x.png") no-repeat right/100%; +} - .app-flower { - background: url("../images/pot_flower@2x.png") no-repeat right; - } +.app-flower { + background: url("../images/pot_flower@2x.png") no-repeat right/100%; } \ No newline at end of file diff --git a/application/layouts/application/default.theme/scss/_base.scss b/application/layouts/application/default.theme/scss/_base.scss index 8a5de50..701f389 100644 --- a/application/layouts/application/default.theme/scss/_base.scss +++ b/application/layouts/application/default.theme/scss/_base.scss @@ -49,7 +49,7 @@ a:focus { display: block; height: image-height( "../images/laxarjs_logo.png" ); width: image-width( "../images/laxarjs_logo.png" ); - background: url( "../images/laxarjs_logo.png" ) no-repeat right; + background: url( "../images/laxarjs_logo.png" ) no-repeat right/100%; } .app-no-selection, @@ -59,11 +59,13 @@ a:focus { } .app-flower { + float: right; margin-top: 40px; margin-right: 20px; margin-bottom: 40px; height: image-height( "../images/pot_flower.png" ); - background: url( "../images/pot_flower.png" ) no-repeat right; + width: image-width( "../images/pot_flower.png" ); + background: url( "../images/pot_flower.png" ) no-repeat right/100%; } .app-footer { @@ -131,11 +133,11 @@ a, } } -@media only screen and (-webkit-min-device-pixel-ratio: 2) { +// @media only screen and (-webkit-min-device-pixel-ratio: 2) { .app-logo { - background: url( "../images/laxarjs_logo@2x.png" ) no-repeat right; + background: url( "../images/laxarjs_logo@2x.png" ) no-repeat right/100%; } .app-flower { - background: url( "../images/pot_flower@2x.png" ) no-repeat right; + background: url( "../images/pot_flower@2x.png" ) no-repeat right/100%; } -} \ No newline at end of file +// } \ No newline at end of file