Skip to content

26 02 2026 UI cleanup #1286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moonheart08 merged 1 commit into from
Feb 28, 2026
Merged

26 02 2026 UI cleanup #1286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Content.Client/_ES/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using Avalonia.Metadata;

[assembly:XmlnsDefinition("https://spacestation14.io", "Content.Client._ES.UI.Controls")]
[assembly:XmlnsDefinition("https://spacestation14.io", "Content.Client._ES.UI.Controls.Layout")]
36 changes: 18 additions & 18 deletions Content.Client/_ES/Evac/Ui/ESEvacConsoleWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
MinSize="400 300"
SetSize="480 330"
Title="{Loc 'es-evac-computer-ui-title'}">
<ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
<BoxContainer Orientation="Vertical" Margin="10">
<PanelContainer VerticalAlignment="Top" StyleClasses="PanelBackgroundBaseDark">
<BoxContainer Orientation="Horizontal" Margin="10">
<BoxContainer Name="StationStatusNameContainer" Orientation="Vertical" VerticalExpand="True" SeparationOverride="5"/>
<Control HorizontalExpand="True"/>
<BoxContainer Name="StationStatusStateContainer" Orientation="Vertical" VerticalExpand="True" SeparationOverride="5"/>
</BoxContainer>
</PanelContainer>
<VScroll HorizontalExpand="True">
<VStack Margin="10">
<Panel VerticalAlignment="Top" StyleClasses="PanelBackgroundBaseDark">
<HStack Margin="10">
<VStack Name="StationStatusNameContainer" VerticalExpand="True" SeparationOverride="5"/>
<Spacer HorizontalExpand="True"/>
<VStack Name="StationStatusStateContainer" VerticalExpand="True" SeparationOverride="5"/>
</HStack>
</Panel>
<RichTextLabel Name="VoteStatusLabel" Margin="10 5" HorizontalAlignment="Left" StyleClasses="LabelSubText"/>
<Control MinHeight="10" VerticalExpand="True"/>
<BoxContainer Orientation="Vertical" VerticalAlignment="Bottom">
<Spacer VSpace="10" VerticalExpand="True"/>
<VStack Orientation="Vertical" VerticalAlignment="Bottom">
<RichTextLabel Name="InfoLabel" HorizontalAlignment="Center" VerticalAlignment="Bottom" ReservesSpace="True"/>
<PanelContainer StyleClasses="PanelBackgroundBaseDark" SetSize="300 120" HorizontalAlignment="Center" VerticalExpand="True" Margin="0 5">
<BoxContainer VerticalExpand="False" HorizontalExpand="False" HorizontalAlignment="Center" VerticalAlignment="Center">
<Panel StyleClasses="PanelBackgroundBaseDark" SetSize="300 120" HorizontalAlignment="Center" VerticalExpand="True" Margin="0 5">
<HStack HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Name="ToggleButton" Text='{Loc "es-evac-computer-ui-button-enable-signal"}' MinSize="250 60"/>
</BoxContainer>
</PanelContainer>
</BoxContainer>
</BoxContainer>
</ScrollContainer>
</HStack>
</Panel>
</VStack>
</VStack>
</VScroll>
</controls:ESEvacConsoleWindow>
14 changes: 7 additions & 7 deletions Content.Client/_ES/Keypad/Ui/ESKeypadControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
xmlns:controls="clr-namespace:Content.Client._ES.Keypad.Ui"
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
<PanelContainer HorizontalExpand="True" VerticalExpand="True">
<HStack>
<FillPanel>
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#000000"/>
</PanelContainer.PanelOverride>
<BoxContainer Margin="5">
<HStack Margin="5">
<RichTextLabel Name="InputLabel" HorizontalExpand="True" HorizontalAlignment="Center"/>
</BoxContainer>
</PanelContainer>
</HStack>
</FillPanel>
<TextureRect Name="LockedIndicator"
Stretch="KeepAspectCentered"
TexturePath="/Textures/Interface/NavMap/beveled_circle.png"
SetSize="16 16"
Margin="10 0 0 0"/>
</BoxContainer>
<Control MinHeight="5"/>
</HStack>
<Spacer VSpace="5"/>
<GridContainer Columns="3">
<Button Name="Button1" Text="{Loc 'es-keypad-ui-button-1'}" StyleClasses="OpenBoth" MinWidth="40"/>
<Button Name="Button2" Text="{Loc 'es-keypad-ui-button-2'}" StyleClasses="OpenBoth" MinWidth="40"/>
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/_ES/Keypad/Ui/ESKeypadWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:controls="clr-namespace:Content.Client._ES.Keypad.Ui"
MinSize="150 205"
Resizable="False">
<BoxContainer Margin="10 5 10 10" HorizontalAlignment="Center">
<HStack Margin="10 5 10 10" HorizontalAlignment="Center">
<controls:ESKeypadControl Name="Keypad"/>
</BoxContainer>
</HStack>
</controls:ESKeypadWindow>
50 changes: 25 additions & 25 deletions Content.Client/_ES/Mind/Ui/ESCharacterWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,43 @@
MinSize="725 425"
SetWidth="725"
SetHeight="575">
<BoxContainer Orientation="Horizontal" Margin="10 5 10 10">
<BoxContainer Orientation="Vertical" SetWidth="270">
<BoxContainer Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Bottom" SizeFlagsStretchRatio="3">
<HStack Margin="10 5 10 10">
<VStack SetWidth="270">
<VStack VerticalExpand="True" VerticalAlignment="Bottom" SizeFlagsStretchRatio="3">
<TextureButton Name="MaskHelpButton" StyleClasses="windowHelpButton" VerticalAlignment="Center" HorizontalAlignment="Right" Disabled="True" Visible="False" />
<BoxContainer Orientation="Vertical" HorizontalAlignment="Center">
<VStack HorizontalAlignment="Center">
<RichTextLabel Name="MaskLabel" Margin="20 0" HorizontalAlignment="Center"/>
<PanelContainer StyleClasses="LowDivider"/>
<LowDivider/>
<RichTextLabel Name="TroupeLabel" HorizontalAlignment="Center"/>
</BoxContainer>
</VStack>
<SpriteView Name="SelfView" OverrideDirection="South" Scale="4 4" HorizontalAlignment="Center" Margin="5 5 5 15"/>
<RichTextLabel Name="NameLabel" HorizontalAlignment="Center" Margin="10 0"/>
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
<HStack HorizontalAlignment="Center">
<TextureRect Name="JobIconTexture" TextureScale="2 2" VerticalAlignment="Center"/>
<Control MinWidth="5"/>
<Spacer HSpace="5"/>
<RichTextLabel Name="JobLabel" VerticalAlignment="Center"/>
</BoxContainer>
</BoxContainer>
<BoxContainer Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalExpand="True" SizeFlagsStretchRatio="2">
</HStack>
</VStack>
<VStack HorizontalAlignment="Center" VerticalAlignment="Center" VerticalExpand="True" SizeFlagsStretchRatio="2">
<RichTextLabel Name="CharacterInfoLabel" HorizontalAlignment="Center" VerticalAlignment="Top"/>
<Control MinHeight="10"/>
<Spacer VSpace="10"/>
<RichTextLabel Name="PromptLabel" HorizontalAlignment="Center" Margin="10 0"/>
<Control MinHeight="10"/>
<Spacer VSpace="10"/>
<RichTextLabel Name="LikesLabel" HorizontalAlignment="Center"/>
<RichTextLabel Name="DislikesLabel" HorizontalAlignment="Center"/>
</BoxContainer>
</BoxContainer>
<PanelContainer StyleClasses="LowDivider" Margin="10 0"/>
<BoxContainer HorizontalExpand="True" Orientation="Vertical">
<BoxContainer>
</VStack>
</VStack>
<LowDivider Margin="10 0"/>
<VFillStack>
<HStack>
<RichTextLabel Name="InfoBlurbText" HorizontalExpand="False"/>
</BoxContainer>
</HStack>
<RichTextLabel Name="ObjectiveHeaderLabel" Text="{Loc 'es-character-window-objective-title'}" Margin="0 0 0 5"/>
<PanelContainer HorizontalExpand="True" VerticalExpand="True" StyleClasses="PanelDark">
<ScrollContainer HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True">
<FillPanel StyleClasses="PanelDark">
<VScroll HorizontalExpand="True" VerticalExpand="True">
<GridContainer Name="ObjectivesContainer" Columns="1" RectClipContent="True" Margin="10 10"/>
</ScrollContainer>
</PanelContainer>
</BoxContainer>
</BoxContainer>
</VScroll>
</FillPanel>
</VFillStack>
</HStack>
</controls:ESCharacterWindow>
22 changes: 11 additions & 11 deletions Content.Client/_ES/Nuke/Ui/ESCryptoNukeConsoleWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Title="{Loc 'es-cryptonuke-ui-window-title'}"
Resizable="False">
<BoxContainer Orientation="Horizontal" Margin="15" HorizontalExpand="True">
<PanelContainer HorizontalExpand="True" VerticalExpand="True">
<HStack Margin="15" HorizontalExpand="True">
<FillPanel>
<PanelContainer.PanelOverride>
<graphics:StyleBoxFlat BackgroundColor="#000000"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Horizontal">
<HStack>
<ui:NavMapControl Name="NavMap" VerticalExpand="True" HorizontalExpand="True" HorizontalAlignment="Left"/>
<BoxContainer Orientation="Vertical" Margin="10" VerticalExpand="True" HorizontalAlignment="Left">
<VStack Margin="10" VerticalExpand="True" HorizontalAlignment="Left">
<RichTextLabel Name="CompromisedLabel"/>
<RichTextLabel Name="CodesLabel"/>
<Control MinHeight="15"/>
<Spacer VSpace="15"/>
<RichTextLabel Name="HeaderLabel" Text="{Loc 'es-cryptonuke-ui-label-disk-header'}"/>
<RichTextLabel Name="LocationsLabel"/>
<Control MinHeight="15"/>
<Spacer VSpace="15"/>
<RichTextLabel Name="FlavorLabel" Text="{Loc 'es-cryptonuke-ui-label-flavor'}"/>
<Control VerticalExpand="True"/>
<Button Visible="False" Name="HackButton" Text="{Loc 'es-cryptonuke-ui-button-hack'}" VerticalAlignment="Bottom" StyleClasses="negative"/>
</BoxContainer>
<Control HorizontalExpand="True"/>
</BoxContainer>
</PanelContainer>
</BoxContainer>
</VStack>
<Spacer HorizontalExpand="True"/>
</HStack>
</FillPanel>
</HStack>
</controls:ESCryptoNukeConsoleWindow>
18 changes: 9 additions & 9 deletions Content.Client/_ES/Objectives/Ui/ESObjectiveControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
xmlns:controls1="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
HorizontalExpand="True">
<PanelContainer HorizontalExpand="True" StyleClasses="BackgroundPanel" Margin="0 5">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="0 5">
<BoxContainer Orientation="Horizontal">
<Panel HorizontalExpand="True" StyleClasses="BackgroundPanel" Margin="0 5">
<VFillStack Margin="0 5">
<HStack>
<controls1:ProgressTextureRect Name="Icon" Margin="0 0 5 0" VerticalAlignment="Center"/>
<RichTextLabel Name="TitleLabel" HorizontalExpand="True" VerticalAlignment="Center"/>
</BoxContainer>
</HStack>
<customControls:HSeparator/>
<BoxContainer Margin="0 0 0 0" HorizontalExpand="True">
<HStack Margin="0 0 0 0" HorizontalExpand="True">
<RichTextLabel Name="DescriptionLabel" HorizontalExpand="True"/>
</BoxContainer>
<Control MinHeight="5"/>
</BoxContainer>
</PanelContainer>
</HStack>
<Spacer VSpace="5"/>
</VFillStack>
</Panel>
</controls:ESObjectiveControl>
10 changes: 5 additions & 5 deletions Content.Client/_ES/Spawning/Ui/ESJobDisplay.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
xmlns:controls="clr-namespace:Content.Client._ES.Spawning.Ui"
Orientation="Vertical"
HorizontalExpand="True">
<BoxContainer Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="False">
<VFillStack VerticalAlignment="Center" HorizontalAlignment="Center">
<Control>
<SpriteView Name="JobView" Scale="3 3"/>
</Control>
<Control MinHeight="5"/>
<Spacer VSpace="5"/>
<Label Name="NameLabel" HorizontalAlignment="Center" StyleClasses="LabelKeyText"/>
<Control MinHeight="5"/>
</BoxContainer>
<Spacer VSpace="5"/>
</VFillStack>
<RichTextLabel Name="DescriptionLabel" HorizontalAlignment="Center" VerticalAlignment="Top" StyleClasses="LabelSubText"/>
<Control VerticalExpand="True"/>
<Spacer VerticalExpand="True"/>
</controls:ESJobDisplay>
34 changes: 17 additions & 17 deletions Content.Client/_ES/Spawning/Ui/ESSpawningWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc 'es-spawn-menu-title'}"
MinSize="950 530">
<BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="10">
<ScrollContainer VScrollEnabled="False" HorizontalExpand="True" MinHeight="30" ReserveScrollbarSpace="True">
<VFillStack Margin="10">
<HScroll MinHeight="30" ReserveScrollbarSpace="True">
<BoxContainer Name="StationCheckboxContainer" Orientation="Horizontal" SeparationOverride="20"/>
</ScrollContainer>
<BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Stretch" VerticalAlignment="Center" VerticalExpand="True" HorizontalExpand="True">
<BoxContainer Name="JobContainer" Margin="5" Orientation="Vertical" HorizontalExpand="True" SeparationOverride="10"/>
<Control MinWidth="10"/>
<BoxContainer Name="JobContainer2" Margin="5" Orientation="Vertical" HorizontalExpand="True" SeparationOverride="10"/>
</BoxContainer>
</ScrollContainer>
</BoxContainer>
</HScroll>
<HFillStack HorizontalExpand="True">
<VFillStack>
<FillScroll HScrollEnabled="False">
<HFillStack HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalExpand="True">
<VFillStack Name="JobContainer" Margin="5" SeparationOverride="10"/>
<Spacer HSpace="10"/>
<VFillStack Name="JobContainer2" Margin="5" SeparationOverride="10"/>
</HFillStack>
</FillScroll>
</VFillStack>
<customControls:VSeparator Margin="10 0 10 30"/>
<BoxContainer Orientation="Vertical">
<VStack>
<controls:ESJobDisplay Name="JobDisplay" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalExpand="True" SetWidth="200" Margin="10"/>
</BoxContainer>
</BoxContainer>
</BoxContainer>
</VStack>
</HFillStack>
</VFillStack>
</controls:ESSpawningWindow>
4 changes: 2 additions & 2 deletions Content.Client/_ES/Stagehand/Ui/ESObservablePlayerButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
HorizontalExpand="True"
SetHeight="40"
StyleClasses="OpenBoth">
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<HStack HorizontalExpand="True">
<TextureRect Name="JobIcon" VerticalAlignment="Center" TextureScale="2 2" MouseFilter="Pass" Margin="0 0 10 0"/>
<RichTextLabel Name="NameLabel" StyleClasses="LabelKeyText" HorizontalExpand="True" RectClipContent="True"/>
<RichTextLabel Name="MaskLabel" StyleClasses="LabelKeyText" HorizontalAlignment="Right" Margin="5 0 15 0"/>
<RichTextLabel Name="TroupeLabel" StyleClasses="LabelKeyText" HorizontalAlignment="Right"/>
</BoxContainer>
</HStack>
</controls:ESObservablePlayerButton>
8 changes: 4 additions & 4 deletions Content.Client/_ES/Stagehand/Ui/ESStagehandJoinWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
Resizable="False"
SetWidth="550"
Title="{Loc 'es-stagehand-ui-title'}">
<BoxContainer Orientation="Vertical" Margin="10 5 10 10">
<VStack Margin="10 5 10 10">
<RichTextLabel Text="{Loc 'es-stagehand-ui-label-explanation'}" HorizontalAlignment="Center" Margin="0 10"/>
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
<HStack HorizontalAlignment="Center">
<Button Name="AcceptButton" Text="{Loc 'es-stagehand-ui-button-text-accept'}" StyleClasses="negative"/>
<Control MinWidth="20"/>
<Button Name="DenyButton" Text="{Loc 'es-stagehand-ui-button-text-deny'}"/>
</BoxContainer>
</BoxContainer>
</HStack>
</VStack>
</controls:ESStagehandJoinWindow>
Loading
Loading