diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs index ba1c36b4de..b3961cc489 100644 --- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs +++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Numerics; -using Content.Client.Stylesheets; +using Content.Client.Stylesheets.Palette; using Content.Client.UserInterface.Controls; using Content.Shared.Construction.Prototypes; using Robust.Client.AutoGenerated; @@ -290,8 +290,7 @@ namespace Content.Client.Construction.UI return; button.Children.Single().Modulate = selected ? Color.Green : Color.White; - var buttonColor = selected ? StyleNano.ButtonColorDefault : Color.Transparent; - buttonPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = buttonColor }; + buttonPanel.PanelOverride = new StyleBoxFlat(selected ? Palettes.Navy.Element : Color.Transparent); } } } diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs index 67631ea58a..fa98d7bbe1 100644 --- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs +++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Numerics; using Content.Client.Lobby; -using Content.Client.Stylesheets; +using Content.Client.Stylesheets.Palette; using Content.Client.UserInterface.Systems.MenuBar.Widgets; using Content.Shared.Construction.Prototypes; using Content.Shared.Whitelist; @@ -361,7 +361,7 @@ namespace Content.Client.Construction.UI var itemButtonPanelContainer = new PanelContainer { - PanelOverride = new StyleBoxFlat { BackgroundColor = StyleNano.ButtonColorDefault }, + PanelOverride = new StyleBoxFlat(Palettes.Navy.Element), Children = { itemButton }, }; diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs index 631984f0b3..e42cea9c37 100644 --- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs +++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs @@ -1,6 +1,5 @@ -using System.Collections.Generic; using System.Linq; -using Content.Client.Stylesheets; +using Content.Client.Stylesheets.Palette; using Content.Shared.Crayon; using Content.Shared.Decals; using Robust.Client.AutoGenerated; @@ -9,9 +8,6 @@ using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Client.Utility; -using Robust.Shared.Graphics; -using Robust.Shared.Maths; using Robust.Shared.Utility; using static Robust.Client.UserInterface.Controls.BaseButton; @@ -110,10 +106,7 @@ namespace Content.Client.Crayon.UI { var panelContainer = new PanelContainer() { - PanelOverride = new StyleBoxFlat() - { - BackgroundColor = StyleNano.ButtonColorDefault, - }, + PanelOverride = new StyleBoxFlat(Palettes.Navy.Element), Children = { button, diff --git a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs index 66530eba91..620e991155 100644 --- a/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs +++ b/Content.Client/SprayPainter/UI/SprayPainterDecals.xaml.cs @@ -1,5 +1,5 @@ using Content.Client.Decals.UI; -using Content.Client.Stylesheets; +using Content.Client.Stylesheets.Palette; using Content.Shared.Decals; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; @@ -89,10 +89,7 @@ public sealed partial class SprayPainterDecals : Control { var panelContainer = new PanelContainer() { - PanelOverride = new StyleBoxFlat() - { - BackgroundColor = StyleNano.ButtonColorDefault, - }, + PanelOverride = new StyleBoxFlat(Palettes.Navy.Element), Children = { button,