Skip to content
This repository was archived by the owner on Jul 27, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions tgui/packages/tgui-panel/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,13 @@ export const Panel = (props, context) => {
<Pane theme={settings.theme}>
<Flex
height={(98-number) + '%'}
<<<<<<< HEAD
direction="column"
grow={0}
shrink={0}>
=======
vertical>
>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716))
<StatTabs
direction="column" />
</Flex>
Expand Down Expand Up @@ -83,6 +87,7 @@ export const Panel = (props, context) => {
</Box>
)}
</DraggableControl>
<<<<<<< HEAD
<Flex
mt={1}
direction="column"
Expand All @@ -91,12 +96,24 @@ export const Panel = (props, context) => {
<Section fitted>
<Flex mx={0.5} align="center">
<Flex.Item mx={0.5} grow={1} overflowX="auto">
=======
<Stack mt={1} vertical height={(number-1) + '%'}>
<Stack.Item>
<Section>
<Stack my={-1.25} align="center">
<Stack.Item grow overflowX="auto">
>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716))
<ChatTabs />
</Flex.Item>
<Flex.Item mx={0.5}>
<PingIndicator />
<<<<<<< HEAD
</Flex.Item>
<Flex.Item mx={0.5}>
=======
</Stack.Item>
<Stack.Item mx={0.5}>
>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716))
<Button
color="grey"
selected={audio.visible}
Expand Down Expand Up @@ -130,7 +147,11 @@ export const Panel = (props, context) => {
<SettingsPanel />
</Flex.Item>
)}
<<<<<<< HEAD
<Flex.Item mt={1} grow={1}>
=======
<Stack.Item mt={1} grow>
>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716))
<Section fill fitted position="relative">
<Pane.Content scrollable>
<ChatPanel lineHeight={settings.lineHeight} />
Expand Down
1 change: 1 addition & 0 deletions tgui/packages/tgui/interfaces/AirAlarm.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { toFixed } from 'common/math';
import { Fragment } from 'inferno';
import { decodeHtmlEntities } from 'common/string';
import { Fragment } from 'inferno';
import { useBackend, useLocalState } from '../backend';
Expand Down
8 changes: 7 additions & 1 deletion tgui/packages/tgui/interfaces/Uplink.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ export const Uplink = (props, context) => {
return (
<Window
theme="syndicate"
<<<<<<< HEAD
resizable
width={620}
height={580}>
=======
width={900}
height={600}>
>>>>>>> 028d52a5d2 (Fix my TGUI mistakes & tweak uplink atomized edition (#4716))
<Window.Content scrollable>
<GenericUplink
currencyAmount={telecrystals}
Expand Down Expand Up @@ -73,6 +78,7 @@ export const GenericUplink = (props, context) => {
Search
<Input
value={searchText}
autoFocus
onInput={(e, value) => setSearchText(value)}
mx={1} />
<Button
Expand Down Expand Up @@ -102,7 +108,7 @@ export const GenericUplink = (props, context) => {
</Tabs>
</Flex.Item>
)}
<Flex.Item grow={1} basis={0}>
<Flex.Item grow mx={2.5} basis={0}>
{items.length === 0 && (
<NoticeBox>
{searchText.length === 0
Expand Down
6 changes: 5 additions & 1 deletion tgui/public/tgui-panel.bundle.js

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion tgui/public/tgui.bundle.js

Large diffs are not rendered by default.