diff --git a/JSMR.UI.Blazor/Components/Chips/TagChip.razor b/JSMR.UI.Blazor/Components/Chips/TagChip.razor index beaa13e..9eb31f8 100644 --- a/JSMR.UI.Blazor/Components/Chips/TagChip.razor +++ b/JSMR.UI.Blazor/Components/Chips/TagChip.razor @@ -23,7 +23,7 @@ if (Tag.IsBlacklisted) { - return ColorVarient.Pink; + return ColorVarient.Red; } return ColorVarient.Secondary; diff --git a/JSMR.UI.Blazor/Components/ProductTag.razor b/JSMR.UI.Blazor/Components/ProductTag.razor index d575e27..6a88101 100644 --- a/JSMR.UI.Blazor/Components/ProductTag.razor +++ b/JSMR.UI.Blazor/Components/ProductTag.razor @@ -37,15 +37,15 @@ private ColorVarient GetColorVarient() { - if (Tag.IsFavorite) - { - return ColorVarient.Mint; - } + // if (Tag.IsFavorite) + // { + // return ColorVarient.Mint; + // } - if (Tag.IsFavorite) - { - return ColorVarient.Orange; - } + // if (Tag.IsBlacklisted) + // { + // return ColorVarient.Red; + // } return ColorVarient.Primary; } diff --git a/JSMR.UI.Blazor/Enums/ColorVarient.cs b/JSMR.UI.Blazor/Enums/ColorVarient.cs index 085b9e2..f3e828b 100644 --- a/JSMR.UI.Blazor/Enums/ColorVarient.cs +++ b/JSMR.UI.Blazor/Enums/ColorVarient.cs @@ -20,7 +20,8 @@ public enum ColorVarient Teal, Blue, Orange, - Pink + Pink, + Red } public static class CssUtil diff --git a/JSMR.UI.Blazor/wwwroot/css/app.css b/JSMR.UI.Blazor/wwwroot/css/app.css index d4c8c80..2293dcc 100644 --- a/JSMR.UI.Blazor/wwwroot/css/app.css +++ b/JSMR.UI.Blazor/wwwroot/css/app.css @@ -787,6 +787,22 @@ code { --chip-fg-rgb: var(--rgb-on-teal, 255 255 255); } + .j-chip.color-blue { + --chip-rgb: var(--rgb-blue); + } + + .j-chip.varient-filled.color-blue { + --chip-fg-rgb: var(--rgb-on-blue, 255 255 255); + } + + .j-chip.color-red { + --chip-rgb: var(--rgb-red); + } + + .j-chip.varient-filled.color-red { + --chip-fg-rgb: var(--rgb-on-red, 255 255 255); + } + .j-chip.color-black { color: inherit; --chip-rgb: 39 39 39; diff --git a/JSMR.UI.Blazor/wwwroot/css/theme-frozen.css b/JSMR.UI.Blazor/wwwroot/css/theme-frozen.css index 90f5f82..b810123 100644 --- a/JSMR.UI.Blazor/wwwroot/css/theme-frozen.css +++ b/JSMR.UI.Blazor/wwwroot/css/theme-frozen.css @@ -45,10 +45,12 @@ --rgb-mint: 167 243 208; --rgb-green: 175 224 125; --rgb-teal: 110 236 255; + --rgb-blue: 115 196 255; --rgb-yellow: 255 224 115; --rgb-on-yellow: 0 0 0; --rgb-pink: 224 104 148; --rgb-on-pink: 255 255 255; + --rgb-red: 224 104 104; /* Colors */ --color-primary: rgb(180,200, 214); --color-secondary: rgb(200,220,234); @@ -61,6 +63,7 @@ --color-orange: #ffa773; --color-pink: #e06894; --color-dark-pink: #832044; + --color-red: #e06868; /* Background Colors */ --background-color-primary: rgb(57, 79, 94); --background-color-secondary: rgb(30, 53, 69);