From c630cde66c155ad92a50cf18098d093fe838fdef Mon Sep 17 00:00:00 2001 From: Matchu Date: Tue, 31 Jul 2012 10:21:20 -0400 Subject: [PATCH] outfit thumbnails beta message --- app/stylesheets/outfits/_edit.sass | 7 ++ app/views/outfits/edit.html.haml | 5 ++ public/stylesheets/compiled/screen.css | 93 ++++++++++++++------------ 3 files changed, 64 insertions(+), 41 deletions(-) diff --git a/app/stylesheets/outfits/_edit.sass b/app/stylesheets/outfits/_edit.sass index 914625bd..ad6bc564 100644 --- a/app/stylesheets/outfits/_edit.sass +++ b/app/stylesheets/outfits/_edit.sass @@ -641,6 +641,13 @@ body.outfits-edit #preview-sharing-thumbnail, #preview-sharing-thumbnail-generating display: none + + #preview-sharing-beta-note + +sidebar-view-child + +warning + font-size: 85% + margin-top: 1em + text-align: center &.urls-loaded #preview-sharing-thumbnail-saving diff --git a/app/views/outfits/edit.html.haml b/app/views/outfits/edit.html.haml index 1983c745..11345a0e 100644 --- a/app/views/outfits/edit.html.haml +++ b/app/views/outfits/edit.html.haml @@ -97,6 +97,11 @@ %span#preview-sharing-thumbnail-saving Saving… %span#preview-sharing-thumbnail-generating Generating… %img#preview-sharing-thumbnail + %p#preview-sharing-beta-note + We're currently beta testing outfit image generation. It might be + slow or not work at all, and we might have to take it down. + Still, we're really excited about this feature, and we hope you + are, too! %ul#preview-sharing-urls %li %label{:for => 'preview-sharing-permalink-url'} Outfit page diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css index 3ef16321..b8072c63 100644 --- a/public/stylesheets/compiled/screen.css +++ b/public/stylesheets/compiled/screen.css @@ -3146,59 +3146,70 @@ body.outfits-edit #preview-sharing #preview-sharing-thumbnail-loading span { body.outfits-edit #preview-sharing #preview-sharing-thumbnail, body.outfits-edit #preview-sharing #preview-sharing-thumbnail-generating { display: none; } -/* line 646, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 645, ../../../app/stylesheets/outfits/_edit.sass */ +body.outfits-edit #preview-sharing #preview-sharing-beta-note { + margin-left: 24px; + margin-right: 24px; + background: #fff6bf; + border: 1px solid #ffd324; + color: #514721; + font-size: 85%; + margin-top: 1em; + text-align: center; +} +/* line 653, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sharing.urls-loaded #preview-sharing-thumbnail-saving { display: none; } -/* line 649, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 656, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sharing.urls-loaded #preview-sharing-urls, body.outfits-edit #preview-sharing.urls-loaded #preview-sharing-url-formats, body.outfits-edit #preview-sharing.urls-loaded #preview-sharing-thumbnail-generating { display: block; } -/* line 653, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 660, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sharing.urls-loaded.thumbnail-loaded #preview-sharing-thumbnail-loading { display: none; } -/* line 656, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 663, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sharing.urls-loaded.thumbnail-loaded #preview-sharing-thumbnail { display: block; } -/* line 660, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 667, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sharing.urls-loaded.thumbnail-available #preview-sharing-thumbnail-loading { -moz-opacity: 0.85; -webkit-opacity: 0.85; -o-opacity: 0.85; -khtml-opacity: 0.85; } -/* line 663, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 670, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sharing.urls-loaded.thumbnail-available #preview-sharing-thumbnail { display: block; } -/* line 666, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 673, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit .preview-sidebar-nav { float: right; font-size: 85%; margin-right: 24px; margin-top: 1em; } -/* line 678, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 685, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar #preview-sidebar-navbar-closet { background: white; border-bottom-color: white; font-weight: bold; } -/* line 682, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 689, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar.viewing-outfits #preview-sidebar-navbar-closet, body.outfits-edit #preview-sidebar.sharing #preview-sidebar-navbar-closet { background: transparent; border-bottom: 1px solid #aaddaa; font-weight: normal; } -/* line 685, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 692, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar.viewing-outfits #preview-sidebar-navbar-outfits, body.outfits-edit #preview-sidebar.sharing #preview-sidebar-navbar-sharing { background: white; border-bottom-color: white; font-weight: bold; } -/* line 688, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 695, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-navbar { -moz-border-radius: 10px 10px 0 0; -webkit-border-radius: 10px 10px 0 0; @@ -3218,7 +3229,7 @@ body.outfits-edit #preview-sidebar-navbar { body.outfits-edit #preview-sidebar-navbar { display: block; } -/* line 697, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 704, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-navbar > div { background: transparent; border-bottom: 1px solid #aaddaa; @@ -3230,11 +3241,11 @@ body.outfits-edit #preview-sidebar-navbar > div { text-align: center; width: 132px; } -/* line 706, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 713, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-navbar > div:first-child { border-left: 0; } -/* line 709, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 716, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-content { -moz-border-radius: 0 0 10px 10px; -webkit-border-radius: 0 0 10px 10px; @@ -3247,7 +3258,7 @@ body.outfits-edit #preview-sidebar-content { height: 300px; overflow: auto; } -/* line 716, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 723, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #save-success, body.outfits-edit #save-error, body.outfits-edit #outfit-not-found, body.outfits-edit #preview-sidebar-donation-request { margin-left: 24px; margin-right: 24px; @@ -3255,7 +3266,7 @@ body.outfits-edit #save-success, body.outfits-edit #save-error, body.outfits-edi margin-top: 1em; text-align: center; } -/* line 723, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 730, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-donation-request { background: #e6efc2; border: 1px solid #c6d880; @@ -3263,23 +3274,23 @@ body.outfits-edit #preview-sidebar-donation-request { font-size: 85%; padding: 1em; } -/* line 728, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 735, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-donation-request-no-thanks { margin-left: 1em; } -/* line 731, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 738, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #save-success { background: #e6efc2; border: 1px solid #c6d880; color: #264409; } -/* line 734, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 741, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #save-error, body.outfits-edit #outfit-not-found { background: #fbe3e4; border: 1px solid #fbc2c4; color: #8a1f11; } -/* line 737, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 744, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #userbar-message { -moz-opacity: 0.5; -webkit-opacity: 0.5; @@ -3287,16 +3298,16 @@ body.outfits-edit #userbar-message { -khtml-opacity: 0.5; display: none; } -/* line 741, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 748, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #new-outfit-name { font: inherit; line-height: 1; } -/* line 745, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 752, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #pet-type-form, body.outfits-edit #pet-state-form, body.outfits-edit #preview-swf, body.outfits-edit #preview-search-form { position: relative; } -/* line 748, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 755, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit .control-overlay { height: 100%; left: 0; @@ -3305,11 +3316,11 @@ body.outfits-edit .control-overlay { width: 100%; z-index: 5; } -/* line 756, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 763, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-sidebar-nav-outfits, body.outfits-edit #save-outfit-signed-in { display: none; } -/* line 759, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 766, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit form#save-outfit-form { display: none; margin-right: 0; @@ -3342,7 +3353,7 @@ body.outfits-edit form#save-outfit-form .outfit-star { margin-left: -24px; margin-right: 0; } -/* line 765, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 772, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button { display: -moz-inline-box; -moz-box-orient: vertical; @@ -3356,46 +3367,46 @@ body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#sav body.outfits-edit form#save-outfit-form .outfit-star, body.outfits-edit form#save-outfit-form input, body.outfits-edit form#save-outfit-form button { *display: inline; } -/* line 770, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 777, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit form#save-outfit-form .outfit-star { margin-top: 0.25em; } -/* line 773, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 780, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit .outfit-url { font-size: 75%; } -/* line 776, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 783, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #preview-search-form-error { background: #fbe3e4; border: 1px solid #fbc2c4; color: #8a1f11; padding: 0.25em 0.5em; } -/* line 781, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 788, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #preview-sidebar-nav-outfits { display: block; } -/* line 783, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 790, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #save-outfit { display: inline-block; } -/* line 787, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 794, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-outfit { display: none; } -/* line 789, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 796, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-current-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.active-outfit #save-outfit-copy { display: inline-block; } -/* line 797, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 804, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit-form { display: block; } -/* line 799, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 806, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-current-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #save-outfit-copy, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #current-outfit-permalink, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #shared-outfit-permalink, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #share-outfit, body.outfits-edit.user-signed-in #save-outfit-wrapper.saving-outfit #shared-outfit-url { display: none; } -/* line 801, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 808, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in .preview-search-form-your-items { display: -moz-inline-box; -moz-box-orient: vertical; @@ -3407,23 +3418,23 @@ body.outfits-edit.user-signed-in .preview-search-form-your-items { body.outfits-edit.user-signed-in .preview-search-form-your-items { *display: inline; } -/* line 803, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 810, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #preview-outfits-not-logged-in { display: none; } -/* line 805, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 812, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-signed-in #preview-outfits-list { display: block; } -/* line 809, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 816, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit.user-not-signed-in #save-outfit-not-signed-in { display: inline-block; } -/* line 813, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 820, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #save-outfit-wrapper.shared-outfit #shared-outfit-permalink, body.outfits-edit #save-outfit-wrapper.shared-outfit #shared-outfit-url { display: inline-block; } -/* line 815, ../../../app/stylesheets/outfits/_edit.sass */ +/* line 822, ../../../app/stylesheets/outfits/_edit.sass */ body.outfits-edit #save-outfit-wrapper.shared-outfit #current-outfit-permalink { display: none !important; }