diff options
| author | Joffrey Bion <joffrey.bion@booking.com> | 2020-08-20 15:36:49 +0200 |
|---|---|---|
| committer | Joffrey Bion <joffrey.bion@booking.com> | 2020-08-20 16:08:49 +0200 |
| commit | 7780d36b540814018b468884d03025d464cd5205 (patch) | |
| tree | 21ac4bb1acf1b126bf805f55555d10a25aa420db /sw-ui/src | |
| parent | Fix style & sort imports (diff) | |
| download | seven-wonders-7780d36b540814018b468884d03025d464cd5205.tar.gz seven-wonders-7780d36b540814018b468884d03025d464cd5205.tar.bz2 seven-wonders-7780d36b540814018b468884d03025d464cd5205.zip | |
Upgrade ktlint and re-enable import order check
Diffstat (limited to 'sw-ui/src')
3 files changed, 19 insertions, 7 deletions
diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt index f5d76dd7..1477dd98 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/GlobalStyles.kt @@ -1,8 +1,7 @@ package org.luxons.sevenwonders.ui.components import kotlinx.css.* -import kotlinx.css.properties.transform -import kotlinx.css.properties.translate +import kotlinx.css.properties.* import styled.StyleSheet object GlobalStyles : StyleSheet("GlobalStyles", isStatic = true) { 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 b7684b2b..507883e7 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 @@ -17,8 +17,7 @@ import kotlinx.css.height import kotlinx.css.margin import kotlinx.css.marginLeft import kotlinx.css.position -import kotlinx.css.properties.borderTop -import kotlinx.css.properties.boxShadow +import kotlinx.css.properties.* import kotlinx.css.px import kotlinx.css.rem import kotlinx.css.verticalAlign diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt index f0c11465..d304880f 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/lobby/Lobby.kt @@ -1,14 +1,28 @@ package org.luxons.sevenwonders.ui.components.lobby -import com.palantir.blueprintjs.* +import com.palantir.blueprintjs.Elevation +import com.palantir.blueprintjs.Intent +import com.palantir.blueprintjs.bpButton +import com.palantir.blueprintjs.bpButtonGroup +import com.palantir.blueprintjs.bpCard +import com.palantir.blueprintjs.bpDivider +import com.palantir.blueprintjs.bpNonIdealState import kotlinx.css.* import kotlinx.css.properties.* import org.luxons.sevenwonders.model.api.LobbyDTO import org.luxons.sevenwonders.model.api.PlayerDTO -import org.luxons.sevenwonders.model.wonders.* +import org.luxons.sevenwonders.model.wonders.AssignedWonder +import org.luxons.sevenwonders.model.wonders.WonderSide +import org.luxons.sevenwonders.model.wonders.deal import org.luxons.sevenwonders.model.wonders.withRandomSide +import org.luxons.sevenwonders.model.wonders.withSide import org.luxons.sevenwonders.ui.components.GlobalStyles -import org.luxons.sevenwonders.ui.redux.* +import org.luxons.sevenwonders.ui.redux.RequestAddBot +import org.luxons.sevenwonders.ui.redux.RequestLeaveLobby +import org.luxons.sevenwonders.ui.redux.RequestReassignWonders +import org.luxons.sevenwonders.ui.redux.RequestReorderPlayers +import org.luxons.sevenwonders.ui.redux.RequestStartGame +import org.luxons.sevenwonders.ui.redux.connectStateAndDispatch import react.RBuilder import react.RComponent import react.RProps |