Merge branch 'outfit_thumbnails'

This commit is contained in:
Emi Matchu 2012-07-31 14:10:57 -04:00
commit 4693d1480f
2 changed files with 5 additions and 5 deletions

View file

@ -490,7 +490,7 @@ body.outfits-edit
header header
+opacity(1) +opacity(1)
.outfit-thumbnail .outfit-thumbnail-wrapper
+opacity(0.75) +opacity(0.75)
footer footer
@ -501,7 +501,7 @@ body.outfits-edit
+opacity(1) +opacity(1)
font-weight: bold font-weight: bold
.outfit-thumbnail .outfit-thumbnail-wrapper
+opacity(1) +opacity(1)
&.confirming-deletion &.confirming-deletion

View file

@ -2892,7 +2892,7 @@ body.outfits-edit #preview-outfits > ul > li:hover header {
-khtml-opacity: 1; -khtml-opacity: 1;
} }
/* line 493, ../../../app/stylesheets/outfits/_edit.sass */ /* line 493, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-outfits > ul > li:hover .outfit-thumbnail { body.outfits-edit #preview-outfits > ul > li:hover .outfit-thumbnail-wrapper {
-moz-opacity: 0.75; -moz-opacity: 0.75;
-webkit-opacity: 0.75; -webkit-opacity: 0.75;
-o-opacity: 0.75; -o-opacity: 0.75;
@ -2911,7 +2911,7 @@ body.outfits-edit #preview-outfits > ul > li.active header {
font-weight: bold; font-weight: bold;
} }
/* line 504, ../../../app/stylesheets/outfits/_edit.sass */ /* line 504, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-outfits > ul > li.active .outfit-thumbnail { body.outfits-edit #preview-outfits > ul > li.active .outfit-thumbnail-wrapper {
-moz-opacity: 1; -moz-opacity: 1;
-webkit-opacity: 1; -webkit-opacity: 1;
-o-opacity: 1; -o-opacity: 1;
@ -2947,7 +2947,7 @@ body.outfits-edit #preview-outfits > ul > li.thumbnail-available .outfit-thumbna
} }
/* line 531, ../../../app/stylesheets/outfits/_edit.sass */ /* line 531, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-outfits > ul > li.loading .outfit-star { body.outfits-edit #preview-outfits > ul > li.loading .outfit-star {
background-image: url('/images/loading_outfit_pane.gif?1343373151'); background-image: url('/images/loading_outfit_pane.gif?1343748088');
} }
/* line 534, ../../../app/stylesheets/outfits/_edit.sass */ /* line 534, ../../../app/stylesheets/outfits/_edit.sass */
body.outfits-edit #preview-outfits #preview-outfits-not-logged-in { body.outfits-edit #preview-outfits #preview-outfits-not-logged-in {