summaryrefslogtreecommitdiff
path: root/sw-ui/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'sw-ui/src/main')
-rw-r--r--sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt4
-rw-r--r--sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt6
-rw-r--r--sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt2
-rw-r--r--sw-ui/src/main/resources/images/background-papyrus1.jpgbin100272 -> 0 bytes
-rw-r--r--sw-ui/src/main/resources/images/background-papyrus2.jpgbin885805 -> 0 bytes
-rw-r--r--sw-ui/src/main/resources/images/backgrounds/papyrus.jpg (renamed from sw-ui/src/main/resources/images/background-papyrus3.jpg)bin480677 -> 480677 bytes
-rw-r--r--sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg (renamed from sw-ui/src/main/resources/images/background-zeus-temple.jpg)bin571089 -> 571089 bytes
-rw-r--r--sw-ui/src/main/resources/images/tokens/wonder-symbol-bright.jpgbin22698 -> 0 bytes
-rw-r--r--sw-ui/src/main/resources/images/tokens/wonder-symbol.pngbin26484 -> 0 bytes
-rw-r--r--sw-ui/src/main/resources/images/tokens/wonder-upgrade.pngbin26743 -> 0 bytes
-rw-r--r--sw-ui/src/main/resources/images/wonder-upgrade-bright.png (renamed from sw-ui/src/main/resources/images/tokens/wonder-upgrade-bright.png)bin26860 -> 26860 bytes
11 files changed, 6 insertions, 6 deletions
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
index 54cdd687..5d5cbcaa 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
+++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt
@@ -52,7 +52,7 @@ private class GameScene(props: GameSceneProps) : RComponent<GameSceneProps, RSta
override fun RBuilder.render() {
styledDiv {
css {
- background = "url('images/background-papyrus3.jpg')"
+ background = "url('images/background/papyrus.jpg')"
backgroundSize = "cover"
+GlobalStyles.fullscreen
}
@@ -179,7 +179,7 @@ private class GameScene(props: GameSceneProps) : RComponent<GameSceneProps, RSta
}
private fun StyledDOMBuilder<DIV>.upgradeWonderSymbol() {
- styledImg(src = "/images/tokens/wonder-upgrade-bright.png") {
+ styledImg(src = "/images/wonder-upgrade-bright.png") {
css {
width = 8.rem
position = Position.absolute
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt
index ea80a827..a95da5ac 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt
+++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/ProductionBar.kt
@@ -62,7 +62,7 @@ private fun RBuilder.fixedResources(resources: List<CountedResource>) {
display = Display.flex
}
resources.forEach {
- tokenWithCount(tokenName = getTokenName(it.type), count = it.count) {
+ tokenWithCount(tokenName = getResourceTokenName(it.type), count = it.count) {
attrs { key = it.type.toString() }
css { marginLeft = 1.rem }
}
@@ -93,7 +93,7 @@ private fun RBuilder.resourceChoice(types: Set<ResourceType>, block: StyledDOMBu
}
block()
for ((i, t) in types.withIndex()) {
- tokenImage(tokenName = getTokenName(t)) {
+ tokenImage(tokenName = getResourceTokenName(t)) {
attrs { this.key = t.toString() }
}
if (i < types.indices.last) {
@@ -129,7 +129,7 @@ private fun RBuilder.tokenImage(tokenName: String, block: StyledDOMBuilder<IMG>.
private fun getTokenImagePath(tokenName: String) = "/images/tokens/$tokenName.png"
-private fun getTokenName(resourceType: ResourceType) = "resources/${resourceType.toString().toLowerCase()}"
+private fun getResourceTokenName(resourceType: ResourceType) = "resources/${resourceType.toString().toLowerCase()}"
private fun CSSBuilder.productionBarStyle() {
alignItems = Align.center
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
index 624f430c..0fae650e 100644
--- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
+++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/home/HomeStyles.kt
@@ -6,7 +6,7 @@ import styled.StyleSheet
object HomeStyles : StyleSheet("HomeStyles", isStatic = true) {
val zeusBackground by css {
- background = "url('images/background-zeus-temple.jpg') center no-repeat"
+ background = "url('images/background/zeus-temple.jpg') center no-repeat"
backgroundSize = "cover"
}
diff --git a/sw-ui/src/main/resources/images/background-papyrus1.jpg b/sw-ui/src/main/resources/images/background-papyrus1.jpg
deleted file mode 100644
index 57bdffcf..00000000
--- a/sw-ui/src/main/resources/images/background-papyrus1.jpg
+++ /dev/null
Binary files differ
diff --git a/sw-ui/src/main/resources/images/background-papyrus2.jpg b/sw-ui/src/main/resources/images/background-papyrus2.jpg
deleted file mode 100644
index b6c8dc5f..00000000
--- a/sw-ui/src/main/resources/images/background-papyrus2.jpg
+++ /dev/null
Binary files differ
diff --git a/sw-ui/src/main/resources/images/background-papyrus3.jpg b/sw-ui/src/main/resources/images/backgrounds/papyrus.jpg
index 90350045..90350045 100644
--- a/sw-ui/src/main/resources/images/background-papyrus3.jpg
+++ b/sw-ui/src/main/resources/images/backgrounds/papyrus.jpg
Binary files differ
diff --git a/sw-ui/src/main/resources/images/background-zeus-temple.jpg b/sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg
index 5a28e933..5a28e933 100644
--- a/sw-ui/src/main/resources/images/background-zeus-temple.jpg
+++ b/sw-ui/src/main/resources/images/backgrounds/zeus-temple.jpg
Binary files differ
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-symbol-bright.jpg b/sw-ui/src/main/resources/images/tokens/wonder-symbol-bright.jpg
deleted file mode 100644
index e02eac2f..00000000
--- a/sw-ui/src/main/resources/images/tokens/wonder-symbol-bright.jpg
+++ /dev/null
Binary files differ
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-symbol.png b/sw-ui/src/main/resources/images/tokens/wonder-symbol.png
deleted file mode 100644
index aa4551b4..00000000
--- a/sw-ui/src/main/resources/images/tokens/wonder-symbol.png
+++ /dev/null
Binary files differ
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-upgrade.png b/sw-ui/src/main/resources/images/tokens/wonder-upgrade.png
deleted file mode 100644
index 4b5d689a..00000000
--- a/sw-ui/src/main/resources/images/tokens/wonder-upgrade.png
+++ /dev/null
Binary files differ
diff --git a/sw-ui/src/main/resources/images/tokens/wonder-upgrade-bright.png b/sw-ui/src/main/resources/images/wonder-upgrade-bright.png
index 0f59c068..0f59c068 100644
--- a/sw-ui/src/main/resources/images/tokens/wonder-upgrade-bright.png
+++ b/sw-ui/src/main/resources/images/wonder-upgrade-bright.png
Binary files differ
bgstack15