@@ -531,17 +531,6 @@ export default function GameActions({
531
531
className = { cx ( maybeFade ( hide ) , containerStyle ) }
532
532
style = { ! inlineUI ? insetStyle ( inset ) : undefined }
533
533
>
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
- ) }
545
534
{ setZoom && (
546
535
< ZoomButton
547
536
className = { cx (
@@ -553,13 +542,18 @@ export default function GameActions({
553
542
zoom = { zoom }
554
543
/>
555
544
) }
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
+ ) }
556
556
< InfoButton actions = { actions } state = { state } />
557
- < EndTurnButton
558
- actions = { actions }
559
- canEndTurn = { playerCanEndTurn }
560
- state = { state }
561
- subscribe = { subscribe }
562
- />
563
557
< AttackRadiusButton
564
558
actions = { actions }
565
559
playerCanEndTurn = { playerCanEndTurn }
@@ -570,6 +564,12 @@ export default function GameActions({
570
564
playerCanEndTurn = { playerCanEndTurn }
571
565
state = { state }
572
566
/>
567
+ < EndTurnButton
568
+ actions = { actions }
569
+ canEndTurn = { playerCanEndTurn }
570
+ state = { state }
571
+ subscribe = { subscribe }
572
+ />
573
573
{ children }
574
574
</ div >
575
575
{ hide && hasEnded && (
@@ -651,13 +651,13 @@ const actionButtonStyle = css`
651
651
z-index : calc (${ applyVar ( 'inset-z' ) } + 2 );
652
652
` ;
653
653
654
- const attackRadiusButtonStyle = css `
654
+ const infoButtonStyle = css `
655
655
bottom : calc (
656
656
(${ size * 3 } px * ${ vars . apply ( 'multiplier' ) } ) + ${ applyVar ( 'inset' ) }
657
657
);
658
658
` ;
659
659
660
- const infoButtonStyle = css `
660
+ const attackRadiusButtonStyle = css `
661
661
bottom : calc (
662
662
(${ size * 4.5 } px * ${ vars . apply ( 'multiplier' ) } ) + ${ applyVar ( 'inset' ) }
663
663
);
0 commit comments