Skip to content

Commit 5e7b39e

Browse files
committed
Swap attack and info buttons.
GitOrigin-RevId: 134463690cde7ce137eca35f7f66aa1dd3c409bc
1 parent 686943e commit 5e7b39e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

hera/ui/GameActions.tsx

+19-19
Original file line numberDiff line numberDiff line change
@@ -531,17 +531,6 @@ export default function GameActions({
531531
className={cx(maybeFade(hide), containerStyle)}
532532
style={!inlineUI ? insetStyle(inset) : undefined}
533533
>
534-
{undoTurn && (
535-
<MenuButton className={cx(actionButtonStyle, undoButtonStyle)}>
536-
<Icon
537-
button
538-
className={cx(iconStyle, !canUndo && disabledButtonStyle)}
539-
horizontalFlip
540-
icon={Forward}
541-
onClick={undo}
542-
/>
543-
</MenuButton>
544-
)}
545534
{setZoom && (
546535
<ZoomButton
547536
className={cx(
@@ -553,13 +542,18 @@ export default function GameActions({
553542
zoom={zoom}
554543
/>
555544
)}
545+
{undoTurn && (
546+
<MenuButton className={cx(actionButtonStyle, undoButtonStyle)}>
547+
<Icon
548+
button
549+
className={cx(iconStyle, !canUndo && disabledButtonStyle)}
550+
horizontalFlip
551+
icon={Forward}
552+
onClick={undo}
553+
/>
554+
</MenuButton>
555+
)}
556556
<InfoButton actions={actions} state={state} />
557-
<EndTurnButton
558-
actions={actions}
559-
canEndTurn={playerCanEndTurn}
560-
state={state}
561-
subscribe={subscribe}
562-
/>
563557
<AttackRadiusButton
564558
actions={actions}
565559
playerCanEndTurn={playerCanEndTurn}
@@ -570,6 +564,12 @@ export default function GameActions({
570564
playerCanEndTurn={playerCanEndTurn}
571565
state={state}
572566
/>
567+
<EndTurnButton
568+
actions={actions}
569+
canEndTurn={playerCanEndTurn}
570+
state={state}
571+
subscribe={subscribe}
572+
/>
573573
{children}
574574
</div>
575575
{hide && hasEnded && (
@@ -651,13 +651,13 @@ const actionButtonStyle = css`
651651
z-index: calc(${applyVar('inset-z')} + 2);
652652
`;
653653

654-
const attackRadiusButtonStyle = css`
654+
const infoButtonStyle = css`
655655
bottom: calc(
656656
(${size * 3}px * ${vars.apply('multiplier')}) + ${applyVar('inset')}
657657
);
658658
`;
659659

660-
const infoButtonStyle = css`
660+
const attackRadiusButtonStyle = css`
661661
bottom: calc(
662662
(${size * 4.5}px * ${vars.apply('multiplier')}) + ${applyVar('inset')}
663663
);

0 commit comments

Comments
 (0)