review pass 1

space-wizards · Sep 24, 2024 · 54cc3dc · 54cc3dc
1 parent a94a803
commit 54cc3dc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()