diff --git a/app/assets/stylesheets/pet_types/show.sass b/app/assets/stylesheets/pet_types/show.sass index cbc1f2cd..c377d44d 100644 --- a/app/assets/stylesheets/pet_types/show.sass +++ b/app/assets/stylesheets/pet_types/show.sass @@ -2,6 +2,7 @@ .rainbow-pool-list --preview-base-width: 200px + margin-bottom: 2em .glitched cursor: help diff --git a/app/views/pet_types/index.html.haml b/app/views/pet_types/index.html.haml index ad457af1..5f36524a 100644 --- a/app/views/pet_types/index.html.haml +++ b/app/views/pet_types/index.html.haml @@ -1,19 +1,28 @@ - title "Rainbow Pool" - use_responsive_design +:markdown + Welcome, welcome! These are all the colors and species of pet we've seen + before. You can also check out our [NC Pet Styles][1] listings, too! + + If you've seen a new kind of pet, you can enter its name on the homepage to + show us! Thank you so much 💖 + + [1]: #{alt_styles_path} + = form_with method: :get, class: "rainbow-pool-filters" do |form| - %fieldset - %legend Filter by: - = form.select :color, @color_names, selected: @selected_color&.human_name, include_blank: "Color…" - = form.select :species, @species_names, selected: @selected_species&.human_name, include_blank: "Species…" - = form.submit "Go", name: nil + %fieldset + %legend Filter by: + = form.select :color, @color_names, selected: @selected_color&.human_name, include_blank: "Color…" + = form.select :species, @species_names, selected: @selected_species&.human_name, include_blank: "Species…" + = form.submit "Go", name: nil - if @pet_types.present? - = will_paginate @pet_types, class: "rainbow-pool-pagination" - %ui.rainbow-pool-list= render @pet_types - = will_paginate @pet_types, class: "rainbow-pool-pagination" + = will_paginate @pet_types, class: "rainbow-pool-pagination" + %ui.rainbow-pool-list= render @pet_types + = will_paginate @pet_types, class: "rainbow-pool-pagination" - else - %p.rainbow-pool-no-results No matching pets found! + %p.rainbow-pool-no-results No matching pets found! - content_for :stylesheets do - = stylesheet_link_tag "application/rainbow-pool" + = stylesheet_link_tag "application/rainbow-pool" diff --git a/app/views/pet_types/show.html.haml b/app/views/pet_types/show.html.haml index e2eee734..3ba0600a 100644 --- a/app/views/pet_types/show.html.haml +++ b/app/views/pet_types/show.html.haml @@ -13,14 +13,37 @@ %li Appearances +%p + These are the various appearances we've seen for this pet! We've hand-labeled + them by their emotion and their gender expression, as best we can. + +%p + If you've seen another kind of #{@pet_type.human_name}, you can enter its + name on the homepage to show us! Thank you 💖 + +- if @pet_states[:canonical].any?(&:glitched?) + %p + Some of these appearances are marked as "glitched", but it's still the + best sample we have. If someone models an unglitched alternative for us, + we'll use that instead! + %ul.rainbow-pool-list = render @pet_states[:canonical] - if @pet_states[:other].present? - %details - %summary Other - %ul.rainbow-pool-list - = render @pet_states[:other] + %h3 Other appearances + + %p + These are some other appearances we've seen over time! + - if @pet_states[:other].any?(&:labeled?) + The labeled appearances here don't appear in the outfit editor by + default anymore, because they've been replaced by better alternatives. + - unless @pet_states[:other].all?(&:labeled?) + The unlabeled appearances here might be what we show in the + outfit editor later, once we have the chance to label them. + +%ul.rainbow-pool-list + = render @pet_states[:other] - content_for :stylesheets do = stylesheet_link_tag "application/breadcrumbs"