From 907eee0abed68eb0d17aaf51efd1ae59283e420a Mon Sep 17 00:00:00 2001 From: paulrpg Date: Tue, 14 Nov 2023 22:29:28 +0000 Subject: [PATCH] finished styling the panel --- .../interfaces/DropshipWeaponsConsole.tsx | 21 +++++++------- .../MfdPanels/MultifunctionDisplay.tsx | 28 ++++++++++++++++--- .../interfaces/MfdPanels/TargetAquisition.tsx | 9 ++++-- .../styles/interfaces/DropshipWeapons.scss | 22 +++++++++++++++ 4 files changed, 63 insertions(+), 17 deletions(-) diff --git a/tgui/packages/tgui/interfaces/DropshipWeaponsConsole.tsx b/tgui/packages/tgui/interfaces/DropshipWeaponsConsole.tsx index a3208d60986b..ffc2ba99c454 100644 --- a/tgui/packages/tgui/interfaces/DropshipWeaponsConsole.tsx +++ b/tgui/packages/tgui/interfaces/DropshipWeaponsConsole.tsx @@ -334,19 +334,20 @@ const PrimaryPanel = (props: MfdProps, context) => { } }; -export const DropshipWeaponsConsole = (_, context) => { - const { data } = useBackend(context); +export const DropshipWeaponsConsole = () => { return ( - - - - - - - - + + + + + + + + + + ); diff --git a/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx b/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx index fff175b92d28..5fcc9b17a714 100644 --- a/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx +++ b/tgui/packages/tgui/interfaces/MfdPanels/MultifunctionDisplay.tsx @@ -75,6 +75,18 @@ export const VerticalPanel = ( ); }; +const HexScrew = () => { + return ( + + + + + ); +}; + export const MfdPanel = (props: MfdProps) => { const topProps = props.topButtons ?? []; const botProps = props.bottomButtons ?? []; @@ -94,11 +106,15 @@ export const MfdPanel = (props: MfdProps) => { return ( - + + + - + + + @@ -114,11 +130,15 @@ export const MfdPanel = (props: MfdProps) => { - + + + - + + +
); diff --git a/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx b/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx index a3c62a3879d8..e56ce04b1e3e 100644 --- a/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx +++ b/tgui/packages/tgui/interfaces/MfdPanels/TargetAquisition.tsx @@ -265,10 +265,13 @@ const lazeMapper = (context) => { return (index: number) => { const target = lazes.length > index ? lazes[index] : undefined; const label = target?.target_name.split(' ')[0] ?? ''; - const squad = label[0] ?? ''; - const number = label.split('-')[1] ?? ''; + const squad = label[0] ?? undefined; + const number = label.split('-')[1] ?? undefined; return { - children: `${squad}-${number}`, + children: + squad !== undefined && number !== undefined + ? `${squad}-${number}` + : undefined, onClick: target ? () => { act('set-camera', { 'equipment_id': target.target_tag }); diff --git a/tgui/packages/tgui/styles/interfaces/DropshipWeapons.scss b/tgui/packages/tgui/styles/interfaces/DropshipWeapons.scss index 4c08761ded9e..300a4219ee32 100644 --- a/tgui/packages/tgui/styles/interfaces/DropshipWeapons.scss +++ b/tgui/packages/tgui/styles/interfaces/DropshipWeapons.scss @@ -5,7 +5,17 @@ border: 1px solid red; } +.WeaponsConsoleBackground { + background-color: #040404; + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; +} + .WeaponsConsole { + padding: 8px; .primarypanel { width: fit-content; height: 512px; @@ -209,6 +219,18 @@ padding: 2px; margin: 0px; } + .Screw_cell_top { + vertical-align: top; + } + .Screw_cell_bot { + vertical-align: bottom; + } + .Screw_cell_right { + text-align: right; + } + .Screw_cell_left { + text-align: left; + } } .Test {