| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-06-14 18:31:53 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-06-14 18:31:53 +0200 |
| commit | 4727d428e505b52b88ff814f27481616621939e4 (patch) | |
| tree | cbcc55c535b656746da1b3a2cd78e85cbfe6c51d | |
| parent | ea51e73fe9e989146789bb5db26b781114a1f1d9 (diff) | |
Sets a saner behavior for the marker tiles.
| -rw-r--r-- | src/battlemap/src/Update/SelectTile.elm | 12 | ||||
| -rw-r--r-- | src/battlemap/src/View/Battlemap/Navigator.elm | 7 | ||||
| -rw-r--r-- | src/battlemap/www/style.css | 6 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/battlemap/src/Update/SelectTile.elm b/src/battlemap/src/Update/SelectTile.elm index 7081d16..8e0c52d 100644 --- a/src/battlemap/src/Update/SelectTile.elm +++ b/src/battlemap/src/Update/SelectTile.elm @@ -101,13 +101,11 @@ go_to_tile model navigator loc_ref = model.char_turn ), ui = - (Struct.UI.reset_displayed_nav - (Struct.UI.set_displayed_tab - Struct.UI.StatusTab - (Struct.UI.set_previous_action - (Just (Struct.UI.SelectedLocation loc_ref)) - model.ui - ) + (Struct.UI.set_displayed_tab + Struct.UI.StatusTab + (Struct.UI.set_previous_action + (Just (Struct.UI.SelectedLocation loc_ref)) + model.ui ) ) }, diff --git a/src/battlemap/src/View/Battlemap/Navigator.elm b/src/battlemap/src/View/Battlemap/Navigator.elm index f5bf209..8740f17 100644 --- a/src/battlemap/src/View/Battlemap/Navigator.elm +++ b/src/battlemap/src/View/Battlemap/Navigator.elm @@ -71,9 +71,7 @@ marker_get_html is_interactive (loc_ref, marker) = [ (Html.Attributes.class "battlemap-navigator-interactive"), (Html.Attributes.class "clickable"), - (Html.Events.onClick - (Struct.Event.TileSelected loc_ref) - ) + (Html.Events.onClick (Struct.Event.TileSelected loc_ref)) ] else [ @@ -81,7 +79,8 @@ marker_get_html is_interactive (loc_ref, marker) = ] else [ - (Html.Attributes.class "battlemap-navigator-non-interactive") + (Html.Attributes.class "battlemap-navigator-non-interactive"), + (Html.Events.onClick (Struct.Event.TileSelected loc_ref)) ] ) ) diff --git a/src/battlemap/www/style.css b/src/battlemap/www/style.css index e22d606..5f55dae 100644 --- a/src/battlemap/www/style.css +++ b/src/battlemap/www/style.css @@ -519,10 +519,11 @@ .battlemap-marker-icon.battlemap-navigator-non-interactive { box-sizing: border-box; - width: 16px; - height: 16px; + width: 12px; + height: 12px; background-size: 100%; opacity: 0.7; + margin: 10px; } .battlemap-marker-icon.battlemap-navigator-interactive @@ -574,6 +575,7 @@ .battlemap-can-go-to-marker.battlemap-navigator-non-interactive { background-image: url(/asset/svg/marker/pawprint.svg); + z-index: 3; } .battlemap-cant-defend-marker |