From 94c28c880345adbd0ba6c19aba5ace035c0d95f3 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Wed, 25 Mar 2026 22:00:53 -0600 Subject: [PATCH] updates --- lib/cobblemon_ui/type_chart.ex | 59 +++++++++++++------ .../live/pokemon_components.ex | 4 +- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/lib/cobblemon_ui/type_chart.ex b/lib/cobblemon_ui/type_chart.ex index 9ea2242..599d2d1 100644 --- a/lib/cobblemon_ui/type_chart.ex +++ b/lib/cobblemon_ui/type_chart.ex @@ -228,24 +228,24 @@ defmodule CobblemonUi.TypeChart do Returns a darkened background color class for a given type. Suitable for use with white text on dark UI backgrounds. """ - def type_color_dark("normal"), do: "bg-[#6B6A4E]" - def type_color_dark("fire"), do: "bg-[#9E5520]" - def type_color_dark("water"), do: "bg-[#3D5A9E]" - def type_color_dark("grass"), do: "bg-[#4A7A2E]" - def type_color_dark("electric"), do: "bg-[#A0871C]" - def type_color_dark("ice"), do: "bg-[#5A8A87]" - def type_color_dark("fighting"), do: "bg-[#7A1D19]" - def type_color_dark("poison"), do: "bg-[#6A2868]" - def type_color_dark("ground"), do: "bg-[#927A40]" - def type_color_dark("flying"), do: "bg-[#6B5A9E]" - def type_color_dark("psychic"), do: "bg-[#A03558]" - def type_color_dark("bug"), do: "bg-[#6A7710]" - def type_color_dark("rock"), do: "bg-[#746822]" - def type_color_dark("ghost"), do: "bg-[#493760]" - def type_color_dark("dragon"), do: "bg-[#4622A0]" - def type_color_dark("dark"), do: "bg-[#48372D]" - def type_color_dark("steel"), do: "bg-[#747485]" - def type_color_dark("fairy"), do: "bg-[#8A546E]" + def type_color_dark("normal"), do: "bg-[#4D4C38]" + def type_color_dark("fire"), do: "bg-[#7A4118]" + def type_color_dark("water"), do: "bg-[#2D4478]" + def type_color_dark("grass"), do: "bg-[#365A22]" + def type_color_dark("electric"), do: "bg-[#7A6815]" + def type_color_dark("ice"), do: "bg-[#426865]" + def type_color_dark("fighting"), do: "bg-[#5C1512]" + def type_color_dark("poison"), do: "bg-[#4E1E4D]" + def type_color_dark("ground"), do: "bg-[#6E5C30]" + def type_color_dark("flying"), do: "bg-[#504378]" + def type_color_dark("psychic"), do: "bg-[#7A2842]" + def type_color_dark("bug"), do: "bg-[#4E580C]" + def type_color_dark("rock"), do: "bg-[#564D1A]" + def type_color_dark("ghost"), do: "bg-[#362848]" + def type_color_dark("dragon"), do: "bg-[#341A78]" + def type_color_dark("dark"), do: "bg-[#342820]" + def type_color_dark("steel"), do: "bg-[#565665]" + def type_color_dark("fairy"), do: "bg-[#683E52]" def type_color_dark(_), do: "bg-base-300" @doc """ @@ -292,6 +292,29 @@ defmodule CobblemonUi.TypeChart do def type_fill_color("fairy"), do: "fill-[#D685AD]" def type_fill_color(_), do: "fill-base-content" + @doc """ + Returns a drop-shadow filter class matching the type's color. + """ + def type_drop_shadow("normal"), do: "drop-shadow-[0_0_6px_#A8A77A80]" + def type_drop_shadow("fire"), do: "drop-shadow-[0_0_6px_#EE813080]" + def type_drop_shadow("water"), do: "drop-shadow-[0_0_6px_#6390F080]" + def type_drop_shadow("grass"), do: "drop-shadow-[0_0_6px_#7AC74C80]" + def type_drop_shadow("electric"), do: "drop-shadow-[0_0_6px_#F7D02C80]" + def type_drop_shadow("ice"), do: "drop-shadow-[0_0_6px_#96D9D680]" + def type_drop_shadow("fighting"), do: "drop-shadow-[0_0_6px_#C22E2880]" + def type_drop_shadow("poison"), do: "drop-shadow-[0_0_6px_#A33EA180]" + def type_drop_shadow("ground"), do: "drop-shadow-[0_0_6px_#E2BF6580]" + def type_drop_shadow("flying"), do: "drop-shadow-[0_0_6px_#A98FF380]" + def type_drop_shadow("psychic"), do: "drop-shadow-[0_0_6px_#F9558780]" + def type_drop_shadow("bug"), do: "drop-shadow-[0_0_6px_#A6B91A80]" + def type_drop_shadow("rock"), do: "drop-shadow-[0_0_6px_#B6A13680]" + def type_drop_shadow("ghost"), do: "drop-shadow-[0_0_6px_#73579780]" + def type_drop_shadow("dragon"), do: "drop-shadow-[0_0_6px_#6F35FC80]" + def type_drop_shadow("dark"), do: "drop-shadow-[0_0_6px_#70574680]" + def type_drop_shadow("steel"), do: "drop-shadow-[0_0_6px_#B7B7CE80]" + def type_drop_shadow("fairy"), do: "drop-shadow-[0_0_6px_#D685AD80]" + def type_drop_shadow(_), do: "" + @doc """ Returns the static asset path for a type's SVG icon. """ diff --git a/lib/cobblemon_ui_web/live/pokemon_components.ex b/lib/cobblemon_ui_web/live/pokemon_components.ex index 328463a..e8a2ac6 100644 --- a/lib/cobblemon_ui_web/live/pokemon_components.ex +++ b/lib/cobblemon_ui_web/live/pokemon_components.ex @@ -405,7 +405,7 @@ defmodule CobblemonUiWeb.PokemonComponents do
<%!-- Type icon --%>
- +
<%!-- Weakness / Resistance rows --%>
@@ -456,7 +456,7 @@ defmodule CobblemonUiWeb.PokemonComponents do class="inline-flex items-center justify-center w-5 h-5" title={@type_name} > - + """ end