Remove cringe hardcodes for background (#20374)

diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
index eac7e37a86d712df47149daee918fbf719c46589..311829e8b2b0d5c15d740be255b2148288be2593 100644 (file)
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
@@ -1,13 +1,9 @@
 <ui:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                 VerticalExpand="True" HorizontalExpand="True"
                 Title="{Loc admin-notes-message-window-title}"
                 MinSize="600 170">
-    <PanelContainer VerticalExpand="True" HorizontalExpand="True">
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A" />
-        </PanelContainer.PanelOverride>
+    <PanelContainer VerticalExpand="True" HorizontalExpand="True" StyleClasses="BackgroundDark">
         <ScrollContainer HScrollEnabled="False" VerticalExpand="True" HorizontalExpand="True" Margin="4">
             <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Bottom">
                 <Label Name="AdminLabel" Text="Loading..." />

diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml
index a2c4f47a22a3cafdd0c3c25719177d42f3ef0f6d..1cc5ff786cd02f66dcb5561bf6eebdc41d85f4fa 100644 (file)
--- a/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml
@@ -1,13 +1,9 @@
 <ui:FancyWindow xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                 VerticalExpand="True" HorizontalExpand="True"
                 Title="{Loc admin-remarks-title}"
                 SetSize="600 400">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A" />
-        </PanelContainer.PanelOverride>
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical" Margin="4">
             <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
                 <BoxContainer Orientation="Vertical" Name="NotesContainer" Access="Public" VerticalExpand="True" />

diff --git a/Content.Client/Administration/UI/BanList/BanListControl.xaml b/Content.Client/Administration/UI/BanList/BanListControl.xaml
index b202e92e57b86376bdec7ab78a838c308780060f..b3c480368936379bcaa4755d78f262e16dd0b2d8 100644 (file)
--- a/Content.Client/Administration/UI/BanList/BanListControl.xaml
+++ b/Content.Client/Administration/UI/BanList/BanListControl.xaml
@@ -1,11 +1,7 @@
 <controls:BanListControl
     xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.Administration.UI.BanList"
-    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+    xmlns:controls="clr-namespace:Content.Client.Administration.UI.BanList">
+    <PanelContainer StyleClasses="BackgroundDark">
         <ScrollContainer>
             <BoxContainer Name="Bans" Access="Public" Orientation="Vertical">
                 <controls:BanListHeader Name="BansHeader"/>

diff --git a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml
index ae8c99bc7511f2b9bbf56722e80b49c970bed0ef..911986827edb3207713665f32d446ecaaed28fb8 100644 (file)
--- a/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml
+++ b/Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml
@@ -1,9 +1,5 @@
-<Popup xmlns="https://spacestation14.io"
-       xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+<Popup xmlns="https://spacestation14.io">
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical">
             <Label Name="ID" HorizontalExpand="True"/>
             <Label Name="IP" HorizontalExpand="True"/>

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
index 89e5694b0d3ec75814291db3d4f3c7e94b388845..05c68615ebbbc1dc4a38fa80048e50f6f70c5958 100644 (file)
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
@@ -1,11 +1,7 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
-         </PanelContainer.PanelOverride>
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer StyleClasses="BackgroundDark">
         <SplitContainer Orientation="Horizontal" VerticalExpand="True">
             <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="1" />
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
index 9d3506c6ba04f27c3686759850bac7c942bd705c..fc4d3ee3aca75fcc92f22fbbeb188564c3551024 100644 (file)
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
@@ -1,10 +1,6 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+         xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Horizontal">
             <BoxContainer Orientation="Vertical">
                 <BoxContainer Orientation="Horizontal" MinWidth="400">

diff --git a/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml b/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml
index 4ebd2d792dd83c65d7aaf02fc95ef41e3a307236..326e4bf3a31b0ffc429a5b5e3aaac46eddc605a8 100644 (file)
--- a/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml
+++ b/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml
@@ -1,9 +1,5 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A"/>
-        </PanelContainer.PanelOverride>
+<Control xmlns="https://spacestation14.io">
+    <PanelContainer StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical">
             <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
                 <BoxContainer Orientation="Vertical" Name="Notes" Access="Public" VerticalExpand="True"/>

diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
index ba9da8eff36215faecdcc9bc361570a4fcf216b4..f978138ca58491bb5de6a0a68d69d9e7965fa3d7 100644 (file)
--- a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml
@@ -1,8 +1,8 @@
 <Popup xmlns="https://spacestation14.io"
        xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer>
+    <PanelContainer StyleClasses="BackgroundDark">
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252A" BorderThickness="1" BorderColor="#18181B"/>
+            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#18181B"/>
         </PanelContainer.PanelOverride>
         <BoxContainer Orientation="Vertical">
             <Label Name="PlayerNameLabel"/>

diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml b/Content.Client/Cargo/UI/CargoProductRow.xaml
index 29c2a6df814b488fdcaec3719d575efdeccb8d73..b47a1e8db226aea0637280eed3de9adb11cdfd7d 100644 (file)
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml
@@ -1,5 +1,4 @@
 <PanelContainer xmlns="https://spacestation14.io"
-                xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                 HorizontalExpand="True">
     <Button Name="MainButton"
             ToolTip=""
@@ -15,10 +14,7 @@
         <Label Name="ProductName"
                Access="Public"
                HorizontalExpand="True" />
-        <PanelContainer>
-            <PanelContainer.PanelOverride>
-                <gfx:StyleBoxFlat BackgroundColor="#25252A" />
-            </PanelContainer.PanelOverride>
+        <PanelContainer StyleClasses="BackgroundDark">
             <Label Name="PointCost"
                    Access="Public"
                    MinSize="52 32"

diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
index 427b3ff1818a294f8bbc0bc4a3be230586f1af46..5a0aeab36682fd95e1dbae06ed61c2b315df5d11 100644 (file)
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml
@@ -1,11 +1,7 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          Margin="0 0 0 10">
-    <PanelContainer VerticalExpand="True">
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#25252a"/>
-        </PanelContainer.PanelOverride>
+    <PanelContainer VerticalExpand="True" StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical"
                       HorizontalExpand="True"
                       VerticalExpand="True"

diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
index e242e636b358406ef64c603e845f26dc67d0c00d..b36fc395ef6b9c4d80b97218569f3efad3b06eba 100644 (file)
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
@@ -1,17 +1,12 @@
 <widgets:ChatBox
     xmlns="https://spacestation14.io"
-    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Chat.Controls"
     MouseFilter="Stop"
     HorizontalExpand="True"
     VerticalExpand="True"
     MinSize="465 225">
-    <PanelContainer HorizontalExpand="True" VerticalExpand="True">
-        <PanelContainer.PanelOverride>
-            <graphics:StyleBoxFlat BackgroundColor="#25252AAA" />
-        </PanelContainer.PanelOverride>
-
+    <PanelContainer HorizontalExpand="True" VerticalExpand="True" StyleClasses="BackgroundDark">
         <BoxContainer Orientation="Vertical" SeparationOverride="4" HorizontalExpand="True" VerticalExpand="True">
             <OutputPanel Name="Contents" HorizontalExpand="True" VerticalExpand="True" Margin="8 8 8 4" />
             <controls:ChatInputBox HorizontalExpand="True" Name="ChatInput" Access="Public" Margin="2"/>