From 54cc3dc2fd4145e52c30650f704a3480117da909 Mon Sep 17 00:00:00 2001
From: Brandon Li <sirbrandonthenerd@gmail.com>
Date: Mon, 23 Sep 2024 20:50:09 -0400
Subject: [PATCH] review pass 1

---
 Content.Client/Administration/UI/AdminUIHelpers.cs       | 3 ++-
 Content.Client/Ame/UI/AmeWindow.xaml.cs                  | 4 ++--
 Content.Client/ContextMenu/UI/ContextMenuElement.xaml    | 2 +-
 Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs | 1 -
 Content.Client/Lobby/UI/CharacterSetupGui.xaml           | 3 ---
 Content.Client/Stylesheets/IStylesheetManager.cs         | 5 +++++
 Content.Client/Stylesheets/StylesheetManager.cs          | 4 ++++
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Content.Client/Administration/UI/AdminUIHelpers.cs b/Content.Client/Administration/UI/AdminUIHelpers.cs
index 688dff3e67a924..2754a4516059f9 100644
--- a/Content.Client/Administration/UI/AdminUIHelpers.cs
+++ b/Content.Client/Administration/UI/AdminUIHelpers.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using Content.Client.Stylesheets;
+using Content.Client.Stylesheets.Redux;
 using Robust.Client.UserInterface.Controls;
 using Timer = Robust.Shared.Timing.Timer;
 
@@ -50,7 +51,7 @@ public static bool TryConfirm(Button button, Dictionary<Button, ConfirmationData
             button.Text = data.OriginalText;
         }, data.Cancellation.Token);
 
-        button.SetOnlyStyleClass("negative");
+        button.SetOnlyStyleClass(StyleClass.Negative);
         button.Text = Loc.GetString("admin-player-actions-confirm");
         return false;
     }
diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs
index dbff4c18f85020..d6d580bcdaf96e 100644
--- a/Content.Client/Ame/UI/AmeWindow.xaml.cs
+++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs
@@ -32,9 +32,9 @@ public void UpdateState(BoundUserInterfaceState state)
             var castState = (AmeControllerBoundUserInterfaceState) state;
 
             // Disable all buttons if not powered
-            if (ContentsContainer.Children.Any())
+            if (Contents.Children.Any())
             {
-                ButtonHelpers.SetButtonDisabledRecursive(ContentsContainer, !castState.HasPower);
+                ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower);
                 EjectButton.Disabled = false;
             }
 
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml
index e4f56a58fff16f..271b6b1bffd827 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml
@@ -13,7 +13,7 @@
                 Name="IconLabel"
                 HorizontalAlignment="Right"
                 VerticalAlignment="Bottom"
-                StyleClasses="contextMenuIconLabel LabelSubText"
+                StyleClasses="LabelSubText"
                 Align="Right"
                 Visible="false"/>
         </SpriteView>
diff --git a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
index 364986dd9d2327..91d34b037bb5b6 100644
--- a/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.xaml.cs
@@ -16,7 +16,6 @@ public partial class ContextMenuElement : ContainerButton
     {
         public const string StyleClassContextMenuButton = "contextMenuButton";
         public const string StyleClassContextMenuExpansionTexture = "contextMenuExpansionTexture";
-        public const string StyleClassEntityMenuIconLabel = "contextMenuIconLabel";
 
         public const float ElementMargin = 2;
         public const float ElementHeight = 32;
diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
index 0d0005bd11836c..de001cb18caa4a 100644
--- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml
@@ -29,9 +29,6 @@
                     <BoxContainer Name="Characters" Orientation="Vertical" />
                 </ScrollContainer>
                 <PanelContainer MinSize="2 0" StyleClasses="highlight">
-                    <!-- <PanelContainer.PanelOverride> -->
-                    <!--     <gfx:StyleBoxFlat BackgroundColor="highlight" ContentMarginTopOverride="2" /> -->
-                    <!-- </PanelContainer.PanelOverride> -->
                 </PanelContainer>
                 <BoxContainer Name="CharEditor" HorizontalExpand="True" />
             </BoxContainer>
diff --git a/Content.Client/Stylesheets/IStylesheetManager.cs b/Content.Client/Stylesheets/IStylesheetManager.cs
index d2915430b2acba..f0695c5717ccaf 100644
--- a/Content.Client/Stylesheets/IStylesheetManager.cs
+++ b/Content.Client/Stylesheets/IStylesheetManager.cs
@@ -8,6 +8,11 @@ public interface IStylesheetManager
     Stylesheet SheetNanotransen { get; }
     Stylesheet SheetSystem { get; }
 
+    [Obsolete("Update to use SheetNanotransen instead")]
+    Stylesheet SheetNano { get; }
+    [Obsolete("Update to use SheetSystem instead")]
+    Stylesheet SheetSpace { get; }
+
     public Dictionary<string, Stylesheet> Stylesheets { get; }
 
     void Initialize();
diff --git a/Content.Client/Stylesheets/StylesheetManager.cs b/Content.Client/Stylesheets/StylesheetManager.cs
index 4aa0ea98c5c33b..e9ec6b7663e8de 100644
--- a/Content.Client/Stylesheets/StylesheetManager.cs
+++ b/Content.Client/Stylesheets/StylesheetManager.cs
@@ -13,6 +13,10 @@ public sealed class StylesheetManager : IStylesheetManager
         public Stylesheet SheetNanotransen { get; private set; } = default!;
         public Stylesheet SheetSystem { get; private set; } = default!;
 
+        // obsolete, TODO(maybe): bring back normal StyleNano.cs / StyleSpace.cs? for easier merging.
+        public Stylesheet SheetNano { get; } = default!;
+        public Stylesheet SheetSpace { get; } = default!;
+
         public Dictionary<string, Stylesheet> Stylesheets { get; private set; } = default!;
 
         public void Initialize()