Skip to content

Commit

Permalink
some fixes for 516
Browse files Browse the repository at this point in the history
  • Loading branch information
NinjaPikachuska committed Jan 17, 2025
1 parent dd093ab commit cf9ae74
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 20 deletions.
6 changes: 4 additions & 2 deletions tgui/packages/tgui/components/Knob.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,14 @@ export const Knob = (props) => {
)}
<svg
className="Knob__ring Knob__ringTrackPivot"
viewBox="0 0 100 100">
viewBox="0 0 100 100"
overflow="visible">
<circle className="Knob__ringTrack" cx="50" cy="50" r="50" />
</svg>
<svg
className="Knob__ring Knob__ringFillPivot"
viewBox="0 0 100 100">
viewBox="0 0 100 100"
overflow="visible">
<circle
className="Knob__ringFill"
style={{
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/AirlockElectronics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const AirLockMainSection = (props, context) => {
export const AirlockElectronics = (props, context) => {
return (
<Window width={420} height={550}>
<Window.Content>
<Window.Content scrollable>
<AirLockMainSection />
</Window.Content>
</Window>
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/EmotePanelEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const EmotePanelEditor = (props, context) => {
const { customEmotes, allHumanEmotes } = data;
return (
<Window width={250} height={400} resizable>
<Window.Content>
<Window.Content scrollable>
{allHumanEmotes.sort().map((emote) => (
<Box fontSize="20px" key={emote}>
<Button.Checkbox
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/GPS.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const GPS = (properties, context) => {
const { emped, active, area, position, saved } = data;
return (
<Window>
<Window.Content>
<Window.Content scrollable>
<Flex direction="column" height="100%">
{emped ? (
<Flex.Item grow="1" basis="0">
Expand Down
26 changes: 16 additions & 10 deletions tgui/packages/tgui/interfaces/ReligiousTool.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const GetInfoItem = (title, list) => {
} else {
listItems = list.map((elem) => (
<li key={elem}>
<Box>{toTitleCase(elem)}</Box>
<Box inline>{toTitleCase(elem)}</Box>
</li>
));
}
Expand Down Expand Up @@ -121,7 +121,7 @@ const ReligionTab = (props, context) => {
<Box textAlign="left" ml={3}>
<ui>
<li>
<Box color="yellow">
<Box inline color="yellow">
Favor: {favor} / {max_favor}
<span style={{ 'color': 'gray', 'font-size': '8pt' }}>
{' '}
Expand All @@ -130,7 +130,9 @@ const ReligionTab = (props, context) => {
</Box>
</li>
<li>
<Box color="pink">Piety: {piety}</Box>
<Box inline color="pink">
Piety: {piety}
</Box>
</li>
</ui>
</Box>
Expand Down Expand Up @@ -164,7 +166,7 @@ const GetAspectBox = (title, aspects, need_br = true) => {
<ui>
{Object.keys(aspects).map((aspect) => (
<li key={aspect}>
<Box color={ASPECT2COLOR[aspect]}>
<Box color={ASPECT2COLOR[aspect]} inline>
{aspect} = {aspects[aspect]}
</Box>
</li>
Expand All @@ -187,12 +189,16 @@ const GetCostsBox = (favor, piety, need_br = true) => {
<ui>
{!!favor && (
<li>
<Box color="yellow">{favor} favor</Box>
<Box inline color="yellow">
{favor} favor
</Box>
</li>
)}
{!!piety && (
<li>
<Box color="pink">{piety} piety</Box>
<Box inline color="pink">
{piety} piety
</Box>
</li>
)}
</ui>
Expand All @@ -207,7 +213,7 @@ const SectSelectTab = (props, context) => {
const { sects, holds_religious_tool } = data;

return (
<Section fill title="Sect Select">
<Section fill height={51} scrollable title="Sect Select">
<Stack vertical>
{sects.map((sect) => (
<Collapsible
Expand Down Expand Up @@ -267,7 +273,7 @@ const Encyclopedia = (props, context) => {
</Tabs.Tab>
))}
</Tabs>
<Section height={52} fill scrollable width="100%">
<Section height={51} fill scrollable width="100%">
<Stack.Item>
{cat === 'RITES' && <ERitesTab />}
{cat === 'SECTS' && <ESectsTab />}
Expand Down Expand Up @@ -333,7 +339,7 @@ const ERitesTab = (props, context) => {
<ui>
{rite.tips.map((tip) => (
<li key={tip}>
<Box>{tip.replace(/<[/]?i>/g, '')}</Box>
<Box inline>{tip.replace(/<[/]?i>/g, '')}</Box>
</li>
))}
</ui>
Expand Down Expand Up @@ -657,7 +663,7 @@ const RiteTab = (props, context) => {
<ui>
{rite.tips.map((tip) => (
<li key={tip}>
<Box>{tip.replace(/<[/]?i>/g, '')}</Box>
<Box inline>{tip.replace(/<[/]?i>/g, '')}</Box>
</li>
))}
</ui>
Expand Down
2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cf9ae74

Please sign in to comment.