From ee261e04d5fc43c91701ef9d25836b30b7e485da Mon Sep 17 00:00:00 2001
From: Thomas <87614336+Aeshus@users.noreply.github.com>
Date: Sat, 16 May 2026 12:09:29 -0500
Subject: [PATCH] Improve Escape Menu (#43895)

* Format xaml

* Use correct styleclass for red quit button

* Use style classes to make the buttons align/connect
---
 Content.Client/Options/UI/EscapeMenu.xaml | 35 +++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index f46d65ac73..f47f41b9fd 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -1,22 +1,33 @@
 <ui1:EscapeMenu xmlns="https://spacestation14.io"
-            xmlns:changelog="clr-namespace:Content.Client.Changelog"
-            xmlns:ui="clr-namespace:Content.Client.Voting.UI"
-            xmlns:ui1="clr-namespace:Content.Client.Options.UI"
-            Title="{Loc 'ui-escape-title'}"
-            Resizable="False">
+                xmlns:changelog="clr-namespace:Content.Client.Changelog"
+                xmlns:ui="clr-namespace:Content.Client.Voting.UI"
+                xmlns:ui1="clr-namespace:Content.Client.Options.UI"
+                xmlns:system="clr-namespace:System;assembly=System.Runtime"
+                Title="{Loc 'ui-escape-title'}"
+                Resizable="False">
 
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
         <ui:VoteCallMenuButton />
         <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
-        <Button Access="Public" Name="RulesButton" Text="{Loc 'ui-escape-rules'}" />
-        <Button Access="Public" Name="GuidebookButton" Text="{Loc 'ui-escape-guidebook'}" />
-        <Button Access="Public" Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" />
-        <changelog:ChangelogButton Access="Public" Name="ChangelogButton" />
-        <Button Access="Public" Name="FeedbackButton" Text="{Loc 'ui-escape-feedback'}"/>
+        <Button Access="Public" Name="RulesButton" Text="{Loc 'ui-escape-rules'}" StyleClasses="OpenLeft" />
+        <Button Access="Public" Name="GuidebookButton" Text="{Loc 'ui-escape-guidebook'}" StyleClasses="OpenBoth" />
+        <Button Access="Public" Name="WikiButton" Text="{Loc 'ui-escape-wiki'}" StyleClasses="OpenBoth" />
+        <changelog:ChangelogButton Access="Public" Name="ChangelogButton" StyleClasses="OpenBoth"/>
+        <Button Access="Public" Name="FeedbackButton" Text="{Loc 'ui-escape-feedback'}" StyleClasses="OpenRight"/>
         <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
         <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
         <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
-        <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
-        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" StyleClasses="ButtonColorRed" />
+        <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}">
+            <Control.StyleClasses>
+                <system:String>negative</system:String>
+                <system:String>OpenLeft</system:String>
+            </Control.StyleClasses>
+        </Button>
+        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}">
+            <Control.StyleClasses>
+                <system:String>negative</system:String>
+                <system:String>OpenRight</system:String>
+            </Control.StyleClasses>
+        </Button>
     </BoxContainer>
 </ui1:EscapeMenu>