diff --git a/app/stylesheets/_layout.sass b/app/stylesheets/_layout.sass index a690dcc0..deff250c 100644 --- a/app/stylesheets/_layout.sass +++ b/app/stylesheets/_layout.sass @@ -207,19 +207,19 @@ dd /* A font by Jos Buivenga (exljbris) -> www.exljbris.nl @font-face font-family: Delicious - src: url("/fonts/Delicious-Roman.otf") + src: local("Delicious"), font-url("Delicious-Roman.otf") @font-face font-family: Delicious font-weight: bold - src: url("/fonts/Delicious-Bold.otf") + src: local("Delicious"), font-url("Delicious-Bold.otf") @font-face font-family: Delicious font-style: italic - src: url("/fonts/Delicious-Italic.otf") + src: local("Delicious"), font-url("Delicious-Italic.otf") @font-face diff --git a/app/stylesheets/outfits/_edit.sass b/app/stylesheets/outfits/_edit.sass index d151d1b4..bd429cbb 100644 --- a/app/stylesheets/outfits/_edit.sass +++ b/app/stylesheets/outfits/_edit.sass @@ -51,7 +51,7 @@ $outfit-content-inner-width: $outfit-content-width - $outfit-header-padding padding-left: $outfit-header-padding .outfit-star background: - image: url(/images/unstarred.png) + image: image-url("unstarred.png") position: left top repeat: no-repeat bottom: -2px @@ -65,7 +65,7 @@ $outfit-content-inner-width: $outfit-content-width - $outfit-header-padding position: relative width: 16px &.loading - background-image: url(/images/loading.gif) !important + background-image: image-url("loading.gif") !important h4 cursor: pointer font-size: 115% @@ -98,7 +98,7 @@ $outfit-content-inner-width: $outfit-content-width - $outfit-header-padding display: block &.starred .outfit-star - background-image: url(/images/star.png) + background-image: image-url("star.png") body.outfits-edit #preview-toolbar @@ -318,7 +318,7 @@ body.outfits-edit $object-img-diff: ($object-width - $object-img-size) / 2 + $object-padding .nc-icon - background: url(/images/nc.png) no-repeat + background: image-url("nc.png") no-repeat height: $nc-icon-size position: absolute right: $object-img-diff @@ -354,7 +354,7 @@ body.outfits-edit h3 margin-bottom: .5em > ul - background: url(/images/loading.gif) no-repeat center top + background: image-url("loading.gif") no-repeat center top display: block font-family: $main-font list-style: none diff --git a/app/stylesheets/partials/clean/_mixins.sass b/app/stylesheets/partials/clean/_mixins.sass index d4e65314..428d7cd4 100644 --- a/app/stylesheets/partials/clean/_mixins.sass +++ b/app/stylesheets/partials/clean/_mixins.sass @@ -30,7 +30,7 @@ font-family: $header-font =awesome-button-color($c) - background: $c url(/images/alert-overlay.png) repeat-x + background: $c image-url("alert-overlay.png") repeat-x &:hover background-color: $c - #111111 diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css index 04c1eba9..23af4cda 100644 --- a/public/stylesheets/compiled/screen.css +++ b/public/stylesheets/compiled/screen.css @@ -114,7 +114,7 @@ a.button, input[type=submit], button { /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */ -moz-border-radius: 5px; -webkit-border-radius: 5px; - background: #006400 url(/images/alert-overlay.png) repeat-x; + background: #006400 url('/images/alert-overlay.png?1289168102') repeat-x; border: 0; display: inline-block; padding: 0.5em 0.75em 0.45em; @@ -142,7 +142,7 @@ a.button:active, input[type=submit]:active, button:active { } /* line 88, ../../../app/stylesheets/_layout.sass */ a.button.loud, input[type=submit].loud, button.loud { - background: #ff5c00 url(/images/alert-overlay.png) repeat-x; + background: #ff5c00 url('/images/alert-overlay.png?1289168102') repeat-x; font-size: 125%; padding: 8px 14px 9px; } @@ -348,19 +348,19 @@ dd { /* A font by Jos Buivenga (exljbris) -> www.exljbris.nl */ @font-face { font-family: Delicious; - src: url("/fonts/Delicious-Roman.otf"); + src: local("Delicious"), url('/fonts/Delicious-Roman.otf'); } @font-face { font-family: Delicious; font-weight: bold; - src: url("/fonts/Delicious-Bold.otf"); + src: local("Delicious"), url('/fonts/Delicious-Bold.otf'); } @font-face { font-family: Delicious; font-style: italic; - src: url("/fonts/Delicious-Italic.otf"); + src: local("Delicious"), url('/fonts/Delicious-Italic.otf'); } @font-face { @@ -796,7 +796,7 @@ body.outfits-edit #pet-state-form label { /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */ -moz-border-radius: 5px; -webkit-border-radius: 5px; - background: #006400 url(/images/alert-overlay.png) repeat-x; + background: #006400 url('/images/alert-overlay.png?1289168102') repeat-x; border: 0; display: inline-block; padding: 0.5em 0.75em 0.45em; @@ -825,7 +825,7 @@ body.outfits-edit #pet-state-form label:active { } /* line 122, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #pet-state-form li.selected label { - background: #0b61a4 url(/images/alert-overlay.png) repeat-x; + background: #0b61a4 url('/images/alert-overlay.png?1289168102') repeat-x; } /* line 34, ../../../app/stylesheets/partials/clean/_mixins.sass */ body.outfits-edit #pet-state-form li.selected label:hover { @@ -841,7 +841,7 @@ body.outfits-edit #save-outfit-wrapper { } /* line 128, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #save-outfit-wrapper button { - background: #ff5c00 url(/images/alert-overlay.png) repeat-x; + background: #ff5c00 url('/images/alert-overlay.png?1289168102') repeat-x; display: none; } /* line 34, ../../../app/stylesheets/partials/clean/_mixins.sass */ @@ -1151,7 +1151,7 @@ body.outfits-edit .object ul li a { /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */ -moz-border-radius: 5px; -webkit-border-radius: 5px; - background: #006400 url(/images/alert-overlay.png) repeat-x; + background: #006400 url('/images/alert-overlay.png?1289168102') repeat-x; border: 0; display: inline-block; padding: 0.5em 0.75em 0.45em; @@ -1164,7 +1164,7 @@ body.outfits-edit .object ul li a { position: relative; font-weight: bold; line-height: 1; - background: #aaaaaa url(/images/alert-overlay.png) repeat-x; + background: #aaaaaa url('/images/alert-overlay.png?1289168102') repeat-x; -moz-opacity: 0.9; -webkit-opacity: 0.9; -o-opacity: 0.9; @@ -1193,7 +1193,7 @@ body.outfits-edit .object:hover ul, body.outfits-edit .object:hover .object-info } /* line 320, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit .nc-icon { - background: url(/images/nc.png) no-repeat; + background: url('/images/nc.png?1285023784') no-repeat; height: 16px; position: absolute; right: 16px; @@ -1250,7 +1250,7 @@ body.outfits-edit #preview-outfits h3 { } /* line 356, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul { - background: url(/images/loading.gif) no-repeat center top; + background: url('/images/loading.gif?1289657021') no-repeat center top; display: block; font-family: "Droid Sans", Helvetica, Arial, Verdana, sans-serif; list-style: none; @@ -1318,7 +1318,7 @@ body.outfits-edit #preview-outfits > ul > li header { } /* line 52, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul > li .outfit-star { - background-image: url(/images/unstarred.png); + background-image: url('/images/unstarred.png?1289657021'); background-position: left top; background-repeat: no-repeat; bottom: -2px; @@ -1334,7 +1334,7 @@ body.outfits-edit #preview-outfits > ul > li .outfit-star { } /* line 67, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul > li .outfit-star.loading { - background-image: url(/images/loading.gif) !important; + background-image: url('/images/loading.gif?1289657021') !important; } /* line 69, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul > li h4 { @@ -1395,7 +1395,7 @@ body.outfits-edit #preview-outfits > ul > li.confirming-deletion .outfit-delete- } /* line 100, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul > li.starred .outfit-star { - background-image: url(/images/star.png); + background-image: url('/images/star.png?1289657021'); } /* line 365, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-outfits > ul.loaded { @@ -1495,7 +1495,7 @@ body.outfits-edit #new-outfit header { } /* line 52, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit .outfit-star { - background-image: url(/images/unstarred.png); + background-image: url('/images/unstarred.png?1289657021'); background-position: left top; background-repeat: no-repeat; bottom: -2px; @@ -1511,7 +1511,7 @@ body.outfits-edit #new-outfit .outfit-star { } /* line 67, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit .outfit-star.loading { - background-image: url(/images/loading.gif) !important; + background-image: url('/images/loading.gif?1289657021') !important; } /* line 69, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit h4 { @@ -1572,7 +1572,7 @@ body.outfits-edit #new-outfit.confirming-deletion .outfit-delete-confirmation { } /* line 100, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit.starred .outfit-star { - background-image: url(/images/star.png); + background-image: url('/images/star.png?1289657021'); } /* line 391, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit h4 { @@ -1723,7 +1723,7 @@ body.outfits-new #load-pet-to-wardrobe input { } /* line 53, ../../../app/stylesheets/outfits/_new.sass */ body.outfits-new #load-pet-to-wardrobe button { - background: #ff5c00 url(/images/alert-overlay.png) repeat-x; + background: #ff5c00 url('/images/alert-overlay.png?1289168102') repeat-x; font-size: 125%; padding: 8px 14px 9px; font-size: 67%;