diff --git a/app/assets/images/about/announcement.png b/app/assets/images/about/announcement.png new file mode 100644 index 00000000..2358f27f Binary files /dev/null and b/app/assets/images/about/announcement.png differ diff --git a/app/assets/images/about/announcement@2x.png b/app/assets/images/about/announcement@2x.png new file mode 100644 index 00000000..a5a19660 Binary files /dev/null and b/app/assets/images/about/announcement@2x.png differ diff --git a/app/assets/images/about/neopass-survey.png b/app/assets/images/about/neopass-survey.png deleted file mode 100644 index bb336af0..00000000 Binary files a/app/assets/images/about/neopass-survey.png and /dev/null differ diff --git a/app/assets/images/about/neopass-survey@2x.png b/app/assets/images/about/neopass-survey@2x.png deleted file mode 100644 index 85b68a26..00000000 Binary files a/app/assets/images/about/neopass-survey@2x.png and /dev/null differ diff --git a/app/assets/stylesheets/outfits/_new.sass b/app/assets/stylesheets/outfits/_new.sass index 3791f52e..a2edac3c 100644 --- a/app/assets/stylesheets/outfits/_new.sass +++ b/app/assets/stylesheets/outfits/_new.sass @@ -7,9 +7,8 @@ body.outfits-new #pet-not-found display: none - .neopass-announcement - border: 1px solid #cd8400 - color: #764a00 + .announcement + border: 1px solid $module-border-color padding: .5em display: grid grid-template-areas: "thumbnail content" @@ -24,9 +23,6 @@ body.outfits-new p:last-of-type margin-bottom: 0 - a - color: #be7a00 - #outfit-forms +clearfix +module diff --git a/app/helpers/outfits_helper.rb b/app/helpers/outfits_helper.rb index b6dd1c08..fd32b49f 100644 --- a/app/helpers/outfits_helper.rb +++ b/app/helpers/outfits_helper.rb @@ -1,7 +1,7 @@ module OutfitsHelper - LAST_DAY_OF_NEOPASS_ANNOUNCEMENT = Date.parse("2024-05-05") - def show_neopass_announcement? - Date.today <= LAST_DAY_OF_NEOPASS_ANNOUNCEMENT + LAST_DAY_OF_ANNOUNCEMENT = Date.parse("2024-09-13") + def show_announcement? + Date.today <= LAST_DAY_OF_ANNOUNCEMENT end def destination_tag(value) diff --git a/app/views/outfits/new.html.haml b/app/views/outfits/new.html.haml index 5523fb4b..38e3e333 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -4,26 +4,27 @@ %p#pet-not-found.alert= t 'pets.load.not_found' -- if show_neopass_announcement? - %section.neopass-announcement - = image_tag "about/neopass-survey.png", width: 70, height: 70, - srcset: {"about/neopass-survey@2x.png": "2x"}, +- if show_announcement? + %section.announcement + = image_tag "about/announcement.png", width: 70, height: 70, + srcset: {"about/announcement@2x.png": "2x"}, class: "neopass-thumbnail" - .neopass-content + .content %p %strong - 💭 Thank you for sending us your NeoPass feedback! + = link_to "We've updated the item page!", + item_path("37002-Floating-Negg-Faerie-Doll") + It should load faster, work better on phones, and be more reliable—no + more "failed to fetch"! Please try it out and let us know if it does + anything weird!! - %p - We're working with TNT now to build new integrations, based on what you - told us! We're glad - = link_to "log in with NeoPass", about_neopass_path - is working well, and we're excited to do the next part! More info soon! - - %p - Thanks again to everyone for helping us out! We're grateful, as always 💖 + %p{style: "font-style: italic; opacity: .85; font-size: 85%"} + By the way, our integration work with TNT is on pause while they focus + on the + = link_to "~Void Within plot~!", "https://www.neopets.com/tvw/", + target: "_blank", style: "color: purple; font-weight: bold" %br - %em —Matchu + We'll start it back up closer to the new year. #outfit-forms - localized_cache :action_suffix => 'outfit_forms_intro' do @@ -134,4 +135,4 @@ = javascript_include_tag 'ajax_auth', 'lib/jquery.timeago', defer: true - content_for :javascripts_body do - = javascript_include_tag 'outfits/new', defer: true \ No newline at end of file + = javascript_include_tag 'outfits/new', defer: true