diff --git a/assets/css/common/global.scss b/assets/css/common/global.scss index acb833c0..809ec760 100644 --- a/assets/css/common/global.scss +++ b/assets/css/common/global.scss @@ -138,6 +138,8 @@ $tag_category_content_official_background: lighten($tag_category_content_officia $tag_category_content_official_border: lighten($tag_category_content_official_color, 18%) !default; $tag_category_content_fanmade_background: lighten($tag_category_content_fanmade_color, 36%) !default; $tag_category_content_fanmade_border: lighten($tag_category_content_fanmade_color, 18%) !default; +$tag_category_species_background: lighten($tag_category_species_color, 44%) !default; +$tag_category_species_border: lighten($tag_category_species_color, 25%) !default; $commission_category_background: saturate(lighten($commission_category_color, 40%), 12%) !default; $commission_category_border: lighten($commission_category_color, 20%) !default; diff --git a/assets/css/themes/dark.scss b/assets/css/themes/dark.scss index c0d96768..8a4b171e 100644 --- a/assets/css/themes/dark.scss +++ b/assets/css/themes/dark.scss @@ -126,6 +126,8 @@ $tag_category_content_official_background: desaturate(darken($tag_category_conte $tag_category_content_official_border: darken($tag_category_content_official_color, 20%) !default; $tag_category_content_fanmade_background: darken($tag_category_content_fanmade_color, 40%) !default; $tag_category_content_fanmade_border: desaturate(darken($tag_category_content_fanmade_color, 20%), 10%) !default; +$tag_category_species_background: darken($tag_category_species_color, 35%) !default; +$tag_category_species_border: desaturate(darken($tag_category_species_color, 20%), 10%) !default; $commission_category_background: darken($commission_category_color, 36%) !default; $commission_category_border: darken($commission_category_color, 25%) !default; diff --git a/assets/css/themes/red.scss b/assets/css/themes/red.scss index c228ddff..37de76ad 100644 --- a/assets/css/themes/red.scss +++ b/assets/css/themes/red.scss @@ -129,6 +129,8 @@ $tag_category_content_official_background: desaturate(darken($tag_category_conte $tag_category_content_official_border: darken($tag_category_content_official_color, 20%) !default; $tag_category_content_fanmade_background: darken($tag_category_content_fanmade_color, 40%) !default; $tag_category_content_fanmade_border: desaturate(darken($tag_category_content_fanmade_color, 20%), 10%) !default; +$tag_category_species_background: darken($tag_category_species_color, 40%) !default; +$tag_category_species_border: desaturate(darken($tag_category_species_color, 20%), 10%) !default; $commission_category_background: darken($commission_category_color, 36%) !default; $commission_category_border: darken($commission_category_color, 25%) !default; diff --git a/assets/css/views/tags.scss b/assets/css/views/tags.scss index 58236568..217f8776 100644 --- a/assets/css/views/tags.scss +++ b/assets/css/views/tags.scss @@ -123,6 +123,11 @@ border-color: $tag_category_content_fanmade_border; color: $tag_category_content_fanmade_color; } + &[data-tag-category="species"] { + background: $tag_category_species_background; + border-color: $tag_category_species_border; + color: $tag_category_species_color; + } } // Quick Tag Table diff --git a/lib/philomena_web/views/image_view.ex b/lib/philomena_web/views/image_view.ex index 7e444601..a110a1cd 100644 --- a/lib/philomena_web/views/image_view.ex +++ b/lib/philomena_web/views/image_view.ex @@ -68,14 +68,14 @@ defmodule PhilomenaWeb.ImageView do def display_order(tags) do tags |> Enum.sort_by(&{ - &1.category != "spoiler", - &1.category != "content-official", - &1.category != "content-fanmade", - &1.category != "species", - &1.category != "oc", - &1.category != "character", - &1.category != "origin", &1.category != "rating", + &1.category != "origin", + &1.category != "character", + &1.category != "oc", + &1.category != "species", + &1.category != "content-fanmade", + &1.category != "content-official", + &1.category != "spoiler", &1.name }) end