From f58c2de8e9c6d1686155f2b73ec4ef17648c8ea8 Mon Sep 17 00:00:00 2001 From: Titouan BION Date: Sat, 20 Feb 2021 23:23:11 +0100 Subject: [PATCH] Display military points on the left side of the wonder instead of over it Resolves #65 --- .../sevenwonders/ui/components/game/Board.kt | 26 ++++++++++-------- .../images/tokens/military/defeat1.png | Bin 5925 -> 3215 bytes 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt index 734099f1..fe60564d 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Board.kt @@ -126,20 +126,24 @@ private fun RBuilder.wonderComponent(wonder: ApiWonder, military: Military) { this.alt = "Wonder ${wonder.name}" } } - victoryPoints(military.victoryPoints) { + styledDiv { css { position = Position.absolute - top = 25.pct // below the wonder name - left = 60.pct - zIndex = 2 // go above the wonder, but below the table cards + top = 20.pct // below the wonder name + left = -(13.pct) + display = Display.flex + flexDirection = FlexDirection.column + alignItems = Align.start } - } - defeatTokenCount(military.nbDefeatTokens) { - css { - position = Position.absolute - top = 25.pct // below the wonder name - left = 80.pct - zIndex = 2 // go above the wonder, but below the table cards + victoryPoints(military.victoryPoints) { + css { + marginBottom = 5.px + } + } + defeatTokenCount(military.nbDefeatTokens) { + css { + marginTop = 5.px + } } } wonder.stages.forEachIndexed { index, stage -> diff --git a/sw-ui/src/main/resources/images/tokens/military/defeat1.png b/sw-ui/src/main/resources/images/tokens/military/defeat1.png index 00a615c78b80ee8c1302cb4b7651f2b0e47e9a05..1c61bf4cdc59d0c3238a775e8244bfe08a1ac921 100644 GIT binary patch literal 3215 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 Hu0mjf0FJ9s