| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-09-25 17:23:02 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-09-25 17:23:02 +0200 |
| commit | 86b4467eb6f0e081ad70c48f77ade26f4e650b81 (patch) | |
| tree | 03ee5948331c30336b64372c251866add6214669 | |
| parent | bf83f621b29b98b8de2110423a9701e00ee835e4 (diff) | |
Reworking the CSS...
68 files changed, 476 insertions, 669 deletions
diff --git a/src/battle/src/ElmModule/View.elm b/src/battle/src/ElmModule/View.elm index 069b0bf..3d3a6ba 100644 --- a/src/battle/src/ElmModule/View.elm +++ b/src/battle/src/ElmModule/View.elm @@ -39,12 +39,12 @@ view model = ), (Html.div [ - (Html.Attributes.class "battle-container-centerer") + (Html.Attributes.class "container-centerer") ] [ (Html.div [ - (Html.Attributes.class "battle-container"), + (Html.Attributes.class "container"), (Html.Attributes.id Constants.UI.viewer_html_id) ] [(View.Map.get_html model)] diff --git a/src/battle/src/View/Character.elm b/src/battle/src/View/Character.elm index d33feb1..d2b6a52 100644 --- a/src/battle/src/View/Character.elm +++ b/src/battle/src/View/Character.elm @@ -31,9 +31,9 @@ get_activation_level_class : ( get_activation_level_class char = if (Struct.Character.is_enabled char) then - (Html.Attributes.class "battle-character-icon-enabled") + (Html.Attributes.class "character-icon-enabled") else - (Html.Attributes.class "battle-character-icon-disabled") + (Html.Attributes.class "character-icon-disabled") get_alliance_class : ( Struct.Model.Type -> @@ -43,9 +43,9 @@ get_alliance_class : ( get_alliance_class model char = if ((Struct.Character.get_player_ix char) == model.player_ix) then - (Html.Attributes.class "battle-character-ally") + (Html.Attributes.class "character-ally") else - (Html.Attributes.class "battle-character-enemy") + (Html.Attributes.class "character-enemy") get_position_style : ( Struct.Character.Type -> @@ -73,7 +73,7 @@ get_focus_class model char = (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char))) ) then - (Html.Attributes.class "battle-character-selected") + (Html.Attributes.class "character-selected") else if ( @@ -82,7 +82,7 @@ get_focus_class model char = (Just (Struct.Character.get_index char)) ) then - (Html.Attributes.class "battle-character-targeted") + (Html.Attributes.class "character-targeted") else (Html.Attributes.class "") @@ -90,7 +90,7 @@ get_icon_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) get_icon_body_html char = (Html.div [ - (Html.Attributes.class "battle-character-icon-body"), + (Html.Attributes.class "character-icon-body"), (Html.Attributes.class ( "asset-character-team-body-" @@ -106,7 +106,7 @@ get_icon_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) get_icon_head_html char = (Html.div [ - (Html.Attributes.class "battle-character-icon-head"), + (Html.Attributes.class "character-icon-head"), (Html.Attributes.class ("asset-character-icon-" ++ (Struct.Character.get_icon_id char)) ) @@ -123,8 +123,8 @@ get_icon_actual_html : ( get_icon_actual_html model char = (Html.div [ - (Html.Attributes.class "battle-tiled"), - (Html.Attributes.class "battle-character-icon"), + (Html.Attributes.class "tiled"), + (Html.Attributes.class "character-icon"), (get_activation_level_class char), (get_alliance_class model char), (get_position_style char), @@ -144,7 +144,7 @@ get_portrait_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) get_portrait_body_html char = (Html.div [ - (Html.Attributes.class "battle-character-portrait-body"), + (Html.Attributes.class "character-portrait-body"), (Html.Attributes.class ( "asset-character-portrait-" @@ -160,7 +160,7 @@ get_portrait_armor_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) get_portrait_armor_html char = (Html.div [ - (Html.Attributes.class "battle-character-portrait-armor"), + (Html.Attributes.class "character-portrait-armor"), (Html.Attributes.class ( "asset-armor-" @@ -194,15 +194,15 @@ get_portrait_html viewer_ix char = ( if ((Struct.Character.get_player_ix char) == viewer_ix) then - "battle-character-ally" + "character-ally" else - "battle-character-enemy" + "character-enemy" ) ), - (Html.Attributes.class "battle-character-portrait"), + (Html.Attributes.class "character-portrait"), (Html.Attributes.class ( - "battle-character-portrait-team-" + "character-portrait-team-" ++ (toString (Struct.Character.get_player_ix char)) ) diff --git a/src/battle/src/View/Controlled.elm b/src/battle/src/View/Controlled.elm index d0c33a5..cb71842 100644 --- a/src/battle/src/View/Controlled.elm +++ b/src/battle/src/View/Controlled.elm @@ -59,7 +59,7 @@ end_turn_button suffix = (Html.button [ (Html.Events.onClick Struct.Event.TurnEnded), - (Html.Attributes.class "battle-end-turn-button") + (Html.Attributes.class "end-turn-button") ] [ (Html.text ("End Turn" ++ suffix)) ] ) @@ -129,7 +129,7 @@ get_html char_turn player_ix = of (Just char) -> (Html.div - [(Html.Attributes.class "battle-controlled")] + [(Html.Attributes.class "controlled")] [ (View.Controlled.CharacterCard.get_summary_html char_turn @@ -149,7 +149,7 @@ get_html char_turn player_ix = (Util.Html.nothing) ), (Html.div - [(Html.Attributes.class "battle-controlled-actions")] + [(Html.Attributes.class "controlled-actions")] (get_available_actions char_turn) ) ] diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm index ac56cbb..08393c8 100644 --- a/src/battle/src/View/Controlled/CharacterCard.elm +++ b/src/battle/src/View/Controlled/CharacterCard.elm @@ -39,9 +39,9 @@ get_name : ( get_name char = (Html.div [ - (Html.Attributes.class "battle-info-card-name"), - (Html.Attributes.class "battle-info-card-text-field"), - (Html.Attributes.class "battle-character-card-name") + (Html.Attributes.class "info-card-name"), + (Html.Attributes.class "info-card-text-field"), + (Html.Attributes.class "character-card-name") ] [ (Html.text (Struct.Character.get_name char)) @@ -63,7 +63,7 @@ get_health_bar char = (View.Gauge.get_html ("HP: " ++ (toString current) ++ "/" ++ (toString max)) (100.0 * ((toFloat current)/(toFloat max))) - [(Html.Attributes.class "battle-character-card-health")] + [(Html.Attributes.class "character-card-health")] [] [] ) @@ -75,7 +75,7 @@ get_rank_status : ( get_rank_status rank = (Html.div [ - (Html.Attributes.class "battle-character-card-status"), + (Html.Attributes.class "character-card-status"), (Html.Attributes.class "clickable"), (Html.Events.onClick (Struct.Event.RequestedHelp (Struct.HelpRequest.HelpOnRank rank)) @@ -84,10 +84,10 @@ get_rank_status rank = ( case rank of Struct.Character.Commander -> - "battle-character-card-commander-status" + "character-card-commander-status" Struct.Character.Target -> - "battle-character-card-target-status" + "character-card-target-status" Struct.Character.Optional -> "" ) @@ -104,7 +104,7 @@ get_statuses : ( get_statuses char = (Html.div [ - (Html.Attributes.class "battle-character-card-statuses") + (Html.Attributes.class "character-card-statuses") ] [ ( @@ -137,7 +137,7 @@ get_active_movement_bar maybe_navigator char = (View.Gauge.get_html ("MP: " ++ (toString current) ++ "/" ++ (toString max)) (100.0 * ((toFloat current)/(toFloat max))) - [(Html.Attributes.class "battle-character-card-movement")] + [(Html.Attributes.class "character-card-movement")] [] [] ) @@ -164,7 +164,7 @@ get_inactive_movement_bar char = ) ) 100.0 - [(Html.Attributes.class "battle-character-card-movement")] + [(Html.Attributes.class "character-card-movement")] [] [] ) @@ -202,7 +202,7 @@ get_weapon_field_header : ( get_weapon_field_header damage_multiplier weapon = (Html.div [ - (Html.Attributes.class "battle-character-card-header") + (Html.Attributes.class "character-card-header") ] [ (Html.div @@ -247,7 +247,7 @@ get_mod_html mod = in (Html.div [ - (Html.Attributes.class "battle-info-card-mod") + (Html.Attributes.class "info-card-mod") ] [ (Html.text @@ -263,7 +263,7 @@ get_multiplied_mod_html multiplier mod = in (Html.div [ - (Html.Attributes.class "battle-character-card-mod") + (Html.Attributes.class "character-card-mod") ] [ (Html.text @@ -285,13 +285,13 @@ get_weapon_details : ( get_weapon_details omnimods damage_multiplier weapon = (Html.div [ - (Html.Attributes.class "battle-character-card-weapon") + (Html.Attributes.class "character-card-weapon") ] [ (get_weapon_field_header damage_multiplier weapon), (Html.div [ - (Html.Attributes.class "battle-info-card-omnimods-listing") + (Html.Attributes.class "info-card-omnimods-listing") ] (List.map (get_multiplied_mod_html damage_multiplier) @@ -309,7 +309,7 @@ get_weapon_summary : ( get_weapon_summary damage_multiplier weapon = (Html.div [ - (Html.Attributes.class "battle-character-card-weapon-summary") + (Html.Attributes.class "character-card-weapon-summary") ] [ (get_weapon_field_header damage_multiplier weapon) @@ -324,12 +324,12 @@ get_armor_details : ( get_armor_details omnimods armor = (Html.div [ - (Html.Attributes.class "battle-character-card-armor") + (Html.Attributes.class "character-card-armor") ] [ (Html.div [ - (Html.Attributes.class "battle-character-card-armor-name") + (Html.Attributes.class "character-card-armor-name") ] [ (Html.text (Struct.Armor.get_name armor)) @@ -337,7 +337,7 @@ get_armor_details omnimods armor = ), (Html.div [ - (Html.Attributes.class "battle-info-card-omnimods-listing") + (Html.Attributes.class "info-card-omnimods-listing") ] (List.map (get_mod_html) @@ -351,7 +351,7 @@ stat_name : String -> (Html.Html Struct.Event.Type) stat_name name = (Html.div [ - (Html.Attributes.class "battle-character-card-stat-name") + (Html.Attributes.class "character-card-stat-name") ] [ (Html.text name) @@ -362,7 +362,7 @@ stat_val : Int -> Bool -> (Html.Html Struct.Event.Type) stat_val val perc = (Html.div [ - (Html.Attributes.class "battle-character-card-stat-val") + (Html.Attributes.class "character-card-stat-val") ] [ (Html.text @@ -388,7 +388,7 @@ get_relevant_stats : ( get_relevant_stats stats = (Html.div [ - (Html.Attributes.class "battle-character-card-stats") + (Html.Attributes.class "character-card-stats") ] [ (stat_name "Dodge"), @@ -415,22 +415,22 @@ get_minimal_html : ( get_minimal_html player_ix char = (Html.div [ - (Html.Attributes.class "battle-info-card"), - (Html.Attributes.class "battle-info-card-minimal"), - (Html.Attributes.class "battle-character-card"), - (Html.Attributes.class "battle-character-card-minimal") + (Html.Attributes.class "info-card"), + (Html.Attributes.class "info-card-minimal"), + (Html.Attributes.class "character-card"), + (Html.Attributes.class "character-card-minimal") ] [ (get_name char), (Html.div [ - (Html.Attributes.class "battle-info-card-top"), - (Html.Attributes.class "battle-character-card-top") + (Html.Attributes.class "info-card-top"), + (Html.Attributes.class "character-card-top") ] [ (Html.div [ - (Html.Attributes.class "battle-info-card-picture") + (Html.Attributes.class "info-card-picture") ] [ (View.Character.get_portrait_html player_ix char) @@ -461,19 +461,19 @@ get_summary_html char_turn player_ix char = in (Html.div [ - (Html.Attributes.class "battle-character-card") + (Html.Attributes.class "character-card") ] [ (get_name char), (Html.div [ - (Html.Attributes.class "battle-info-card-top"), - (Html.Attributes.class "battle-character-card-top") + (Html.Attributes.class "info-card-top"), + (Html.Attributes.class "character-card-top") ] [ (Html.div [ - (Html.Attributes.class "battle-info-card-picture") + (Html.Attributes.class "info-card-picture") ] [ (View.Character.get_portrait_html player_ix char) @@ -508,20 +508,20 @@ get_full_html player_ix char = in (Html.div [ - (Html.Attributes.class "battle-info-card"), - (Html.Attributes.class "battle-character-card") + (Html.Attributes.class "info-card"), + (Html.Attributes.class "character-card") ] [ (get_name char), (Html.div [ - (Html.Attributes.class "battle-info-card-top"), - (Html.Attributes.class "battle-character-card-top") + (Html.Attributes.class "info-card-top"), + (Html.Attributes.class "character-card-top") ] [ (Html.div [ - (Html.Attributes.class "battle-info-card-picture") + (Html.Attributes.class "info-card-picture") ] [ (View.Character.get_portrait_html player_ix char) diff --git a/src/battle/src/View/Controlled/ManualControls.elm b/src/battle/src/View/Controlled/ManualControls.elm index 1dceafb..7dd88e7 100644 --- a/src/battle/src/View/Controlled/ManualControls.elm +++ b/src/battle/src/View/Controlled/ManualControls.elm @@ -20,7 +20,7 @@ direction_button : ( direction_button dir label = (Html.div [ - (Html.Attributes.class ("battle-manual-controls-" ++ label)), + (Html.Attributes.class ("manual-controls-" ++ label)), (Html.Attributes.class "clickable"), (Html.Events.onClick (Struct.Event.DirectionRequested dir) @@ -33,7 +33,7 @@ go_button : (Html.Html Struct.Event.Type) go_button = (Html.button [ - (Html.Attributes.class "battle-manual-controls-go"), + (Html.Attributes.class "manual-controls-go"), (Html.Events.onClick Struct.Event.AttackWithoutMovingRequest) ] [ @@ -48,7 +48,7 @@ get_html : (Html.Html Struct.Event.Type) get_html = (Html.div [ - (Html.Attributes.class "battle-manual-controls") + (Html.Attributes.class "manual-controls") ] [ (direction_button Struct.Direction.Left "left"), diff --git a/src/battle/src/View/Controlled/Targets.elm b/src/battle/src/View/Controlled/Targets.elm index eee5a54..4b27175 100644 --- a/src/battle/src/View/Controlled/Targets.elm +++ b/src/battle/src/View/Controlled/Targets.elm @@ -63,7 +63,7 @@ get_html : ( get_html model target_ref = (Html.div [ - (Html.Attributes.class "battle-side-bar-targets") + (Html.Attributes.class "side-bar-targets") ] [(get_target_info_html model target_ref)] ) diff --git a/src/battle/src/View/Gauge.elm b/src/battle/src/View/Gauge.elm index cf89f3a..2b9c4e0 100644 --- a/src/battle/src/View/Gauge.elm +++ b/src/battle/src/View/Gauge.elm @@ -18,7 +18,7 @@ get_text_div: ( get_text_div text extra_txt_attr = (Html.div ( - [(Html.Attributes.class "battle-gauge-text")] + [(Html.Attributes.class "gauge-text")] ++ extra_txt_attr ) [ @@ -41,7 +41,7 @@ get_bar_div percent extra_bar_attr = ] ), (Html.Attributes.class - "battle-gauge-bar" + "gauge-bar" ) ] ++ @@ -66,7 +66,7 @@ get_html : ( get_html text percent extra_div_attr extra_bar_attr extra_txt_attr = (Html.div ( - [(Html.Attributes.class "battle-gauge")] + [(Html.Attributes.class "gauge")] ++ extra_div_attr ) [ diff --git a/src/battle/src/View/MainMenu.elm b/src/battle/src/View/MainMenu.elm index 96bf539..e436555 100644 --- a/src/battle/src/View/MainMenu.elm +++ b/src/battle/src/View/MainMenu.elm @@ -33,7 +33,7 @@ get_html : (Html.Html Struct.Event.Type) get_html = (Html.div [ - (Html.Attributes.class "battle-main-menu") + (Html.Attributes.class "main-menu") ] ( (get_main_menu_button_html) diff --git a/src/battle/src/View/Map.elm b/src/battle/src/View/Map.elm index ad10695..12e9474 100644 --- a/src/battle/src/View/Map.elm +++ b/src/battle/src/View/Map.elm @@ -32,7 +32,7 @@ get_tiles_html : Struct.Map.Type -> (Html.Html Struct.Event.Type) get_tiles_html map = (Html.div [ - (Html.Attributes.class "battle-tiles-layer"), + (Html.Attributes.class "tiles-layer"), (Html.Attributes.style [ ( @@ -86,7 +86,7 @@ maybe_print_navigator interactive maybe_nav = (Just nav) -> (Html.div [ - (Html.Attributes.class ("battle-navigator" ++ name_suffix)) + (Html.Attributes.class ("navigator" ++ name_suffix)) ] (View.Map.Navigator.get_html (Struct.Navigator.get_summary nav) @@ -105,7 +105,7 @@ get_characters_html : ( get_characters_html model characters = (Html.div [ - (Html.Attributes.class "battle-characters") + (Html.Attributes.class "characters") ] (List.map (View.Map.Character.get_html model) @@ -123,7 +123,7 @@ get_html : ( get_html model = (Html.div [ - (Html.Attributes.class "battle-actual"), + (Html.Attributes.class "actual"), (Html.Attributes.style ( if ((Struct.UI.get_zoom_level model.ui) == 1) diff --git a/src/battle/src/View/Map/Character.elm b/src/battle/src/View/Map/Character.elm index aaf7cb2..4470b4a 100644 --- a/src/battle/src/View/Map/Character.elm +++ b/src/battle/src/View/Map/Character.elm @@ -36,7 +36,7 @@ get_animation_class model char = then (Html.Attributes.class "") else - (Html.Attributes.class "battle-character-selected") + (Html.Attributes.class "character-selected") (Struct.TurnResultAnimator.TurnResult current_action) -> if @@ -51,7 +51,7 @@ get_animation_class model char = case current_action of (Struct.TurnResult.Moved _) -> (Html.Attributes.class - "battle-animated-character-icon" + "animated-character-icon" ) _ -> (Html.Attributes.class "") @@ -64,9 +64,9 @@ get_activation_level_class : ( get_activation_level_class char = if (Struct.Character.is_enabled char) then - (Html.Attributes.class "battle-character-icon-enabled") + (Html.Attributes.class "character-icon-enabled") else - (Html.Attributes.class "battle-character-icon-disabled") + (Html.Attributes.class "character-icon-disabled") get_alliance_class : ( Struct.Model.Type -> @@ -76,9 +76,9 @@ get_alliance_class : ( get_alliance_class model char = if ((Struct.Character.get_player_ix char) == model.player_ix) then - (Html.Attributes.class "battle-character-ally") + (Html.Attributes.class "character-ally") else - (Html.Attributes.class "battle-character-enemy") + (Html.Attributes.class "character-enemy") get_position_style : ( Struct.Character.Type -> @@ -106,7 +106,7 @@ get_focus_class model char = (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char))) ) then - (Html.Attributes.class "battle-character-selected") + (Html.Attributes.class "character-selected") else if ( @@ -115,7 +115,7 @@ get_focus_class model char = (Just (Struct.Character.get_index char)) ) then - (Html.Attributes.class "battle-character-targeted") + (Html.Attributes.class "character-targeted") else (Html.Attributes.class "") @@ -123,7 +123,7 @@ get_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) get_body_html char = (Html.div [ - (Html.Attributes.class "battle-character-icon-body"), + (Html.Attributes.class "character-icon-body"), (Html.Attributes.class ( "asset-character-team-body-" @@ -139,7 +139,7 @@ get_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type) get_head_html char = (Html.div [ - (Html.Attributes.class "battle-character-icon-head"), + (Html.Attributes.class "character-icon-head"), (Html.Attributes.class ("asset-character-icon-" ++ (Struct.Character.get_icon_id char)) ) @@ -154,7 +154,7 @@ get_banner_html char = Struct.Character.Commander -> (Html.div [ - (Html.Attributes.class "battle-character-icon-banner"), + (Html.Attributes.class "character-icon-banner"), (Html.Attributes.class "asset-character-icon-commander-banner") ] [ @@ -164,7 +164,7 @@ get_banner_html char = Struct.Character.Target -> (Html.div [ - (Html.Attributes.class "battle-character-icon-banner"), + (Html.Attributes.class "character-icon-banner"), (Html.Attributes.class "asset-character-icon-target-banner") ] [ @@ -181,8 +181,8 @@ get_actual_html : ( get_actual_html model char = (Html.div [ - (Html.Attributes.class "battle-tiled"), - (Html.Attributes.class "battle-character-icon"), + (Html.Attributes.class "tiled"), + (Html.Attributes.class "character-icon"), (get_animation_class model char), (get_activation_level_class char), (get_alliance_class model char), diff --git a/src/battle/src/View/Map/Navigator.elm b/src/battle/src/View/Map/Navigator.elm index 63c982a..c4b430f 100644 --- a/src/battle/src/View/Map/Navigator.elm +++ b/src/battle/src/View/Map/Navigator.elm @@ -28,12 +28,10 @@ marker_get_html is_interactive (loc_ref, marker) = (Html.div ( [ - (Html.Attributes.class "battle-marker-icon"), - (Html.Attributes.class "battle-tiled"), + (Html.Attributes.class "marker-icon"), + (Html.Attributes.class "tiled"), (Html.Attributes.class ( - "battle-" - ++ ( case marker of Struct.Marker.CanGoToCanDefend -> "can-go-to-can-defend" @@ -79,7 +77,7 @@ marker_get_html is_interactive (loc_ref, marker) = ) then [ - (Html.Attributes.class "battle-navigator-interactive"), + (Html.Attributes.class "navigator-interactive"), (Html.Attributes.class "clickable"), (Html.Events.onClick (Struct.Event.CharacterOrTileSelected loc_ref) @@ -87,11 +85,11 @@ marker_get_html is_interactive (loc_ref, marker) = ] else [ - (Html.Attributes.class "battle-navigator-interactive") + (Html.Attributes.class "navigator-interactive") ] else [ - (Html.Attributes.class "battle-navigator-non-interactive"), + (Html.Attributes.class "navigator-non-interactive"), (Html.Events.onClick (Struct.Event.CharacterOrTileSelected loc_ref) ) @@ -123,20 +121,20 @@ path_node_get_html is_below_markers next_dir (curr_loc, curr_dir, curr_nodes) = ( (Html.div [ - (Html.Attributes.class "battle-path-icon"), + (Html.Attributes.class "path-icon"), (Html.Attributes.class ( if (is_below_markers) then - "battle-path-icon-below-markers" + "path-icon-below-markers" else - "battle-path-icon-above-markers" + "path-icon-above-markers" ) ), - (Html.Attributes.class "battle-tiled"), + (Html.Attributes.class "tiled"), (Html.Attributes.class ( - "battle-path-icon-" + "path-icon-" ++ (Struct.Direction.to_string curr_dir) ++ @@ -185,12 +183,12 @@ mark_the_spot : ( mark_the_spot loc origin_dir = (Html.div [ - (Html.Attributes.class "battle-path-icon"), - (Html.Attributes.class "battle-path-icon-above-markers"), - (Html.Attributes.class "battle-tiled"), + (Html.Attributes.class "path-icon"), + (Html.Attributes.class "path-icon-above-markers"), + (Html.Attributes.class "tiled"), (Html.Attributes.class ( - "battle-path-icon-mark" + "path-icon-mark" ++ (Struct.Direction.to_string origin_dir) ) diff --git a/src/battle/src/View/Map/Tile.elm b/src/battle/src/View/Map/Tile.elm index 36e7cb4..962b998 100644 --- a/src/battle/src/View/Map/Tile.elm +++ b/src/battle/src/View/Map/Tile.elm @@ -24,7 +24,7 @@ get_layer_html : ( get_layer_html index border = (Html.div [ - (Html.Attributes.class ("battle-tile-icon-f-" ++ (toString index))), + (Html.Attributes.class ("tile-icon-f-" ++ (toString index))), (Html.Attributes.style [ ( @@ -52,7 +52,7 @@ get_content_html tile = ( (Html.div [ - (Html.Attributes.class "battle-tile-icon-bg"), + (Html.Attributes.class "tile-icon-bg"), (Html.Attributes.style [ ( @@ -73,7 +73,7 @@ get_content_html tile = ( (Html.div [ - (Html.Attributes.class "battle-tile-icon-dt"), + (Html.Attributes.class "tile-icon-dt"), (Html.Attributes.style [ ( @@ -105,11 +105,11 @@ get_html tile = let tile_loc = (Struct.Tile.get_location tile) in (Html.div [ - (Html.Attributes.class "battle-tile-icon"), - (Html.Attributes.class "battle-tiled"), + (Html.Attributes.class "tile-icon"), + (Html.Attributes.class "tiled"), (Html.Attributes.class ( - "battle-tile-variant-" + "tile-variant-" ++ (toString (Struct.Tile.get_local_variant_ix tile)) ) ), diff --git a/src/battle/src/View/MessageBoard/Animator/Attack.elm b/src/battle/src/View/MessageBoard/Animator/Attack.elm index 437a76d..78c1f49 100644 --- a/src/battle/src/View/MessageBoard/Animator/Attack.elm +++ b/src/battle/src/View/MessageBoard/Animator/Attack.elm @@ -47,7 +47,7 @@ get_empty_attack_html : (Html.Html Struct.Event.Type) get_empty_attack_html = (Html.div [ - (Html.Attributes.class "battle-message-attack-text") + (Html.Attributes.class "message-attack-text") ] [] ) @@ -65,7 +65,7 @@ get_attack_html attacker defender attack = in (Html.div [ - (Html.Attributes.class "battle-message-attack-text") + (Html.Attributes.class "message-attack-text") ] [ (Html.text @@ -111,9 +111,9 @@ get_attack_animation_class : ( get_attack_animation_class attack char = if (attack.critical) then - "battle-animated-portrait-attack-critical" + "animated-portrait-attack-critical" else - "battle-animated-portrait-attacks" + "animated-portrait-attacks" get_defense_animation_class : ( Struct.Attack.Type -> @@ -125,22 +125,22 @@ get_defense_animation_class attack char = then if (attack.precision == Struct.Attack.Miss) then - "battle-animated-portrait-dodges" + "animated-portrait-dodges" else - "battle-animated-portrait-undamaged" + "animated-portrait-undamaged" else if ((Struct.Character.get_current_health char) > 0) then if (attack.precision == Struct.Attack.Graze) then - "battle-animated-portrait-grazed-damage" + "animated-portrait-grazed-damage" else - "battle-animated-portrait-damaged" + "animated-portrait-damaged" else if (attack.precision == Struct.Attack.Graze) then - "battle-animated-portrait-grazed-death" + "animated-portrait-grazed-death" else - "battle-animated-portrait-dies" + "animated-portrait-dies" get_attacker_card : ( (Maybe Struct.Attack.Type) -> @@ -154,12 +154,12 @@ get_attacker_card maybe_attack char = if ((Struct.Character.get_current_health char) > 0) then [ - (Html.Attributes.class "battle-animated-portrait") + (Html.Attributes.class "animated-portrait") ] else [ - (Html.Attributes.class "battle-animated-portrait-absent"), - (Html.Attributes.class "battle-animated-portrait") + (Html.Attributes.class "animated-portrait-absent"), + (Html.Attributes.class "animated-portrait") ] (Just attack) -> @@ -179,7 +179,7 @@ get_attacker_card maybe_attack char = (get_attack_animation_class attack char) ) ), - (Html.Attributes.class "battle-animated-portrait") + (Html.Attributes.class "animated-portrait") ] ) [ @@ -202,12 +202,12 @@ get_defender_card maybe_attack char = if ((Struct.Character.get_current_health char) > 0) then [ - (Html.Attributes.class "battle-animated-portrait") + (Html.Attributes.class "animated-portrait") ] else [ - (Html.Attributes.class "battle-animated-portrait-absent"), - (Html.Attributes.class "battle-animated-portrait") + (Html.Attributes.class "animated-portrait-absent"), + (Html.Attributes.class "animated-portrait") ] (Just attack) -> @@ -227,7 +227,7 @@ get_defender_card maybe_attack char = (get_defense_animation_class attack char) ) ), - (Html.Attributes.class "battle-animated-portrait") + (Html.Attributes.class "animated-portrait") ] ) [ @@ -255,8 +255,8 @@ get_placeholder_html characters attacker_ix defender_ix maybe_attack = ((Just atkchar), (Just defchar)) -> (Html.div [ - (Html.Attributes.class "battle-message-board"), - (Html.Attributes.class "battle-message-attack") + (Html.Attributes.class "message-board"), + (Html.Attributes.class "message-attack") ] ( [ diff --git a/src/battle/src/View/MessageBoard/Error.elm b/src/battle/src/View/MessageBoard/Error.elm index 797d89f..c03467a 100644 --- a/src/battle/src/View/MessageBoard/Error.elm +++ b/src/battle/src/View/MessageBoard/Error.elm @@ -24,8 +24,8 @@ get_html : ( get_html model error = (Html.div [ - (Html.Attributes.class "battle-message-board"), - (Html.Attributes.class "battle-error") + (Html.Attributes.class "message-board"), + (Html.Attributes.class "error") ] [ (Html.text (Struct.Error.to_string error)) diff --git a/src/battle/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm index 6c20bbc..a1d1af7 100644 --- a/src/battle/src/View/MessageBoard/Help.elm +++ b/src/battle/src/View/MessageBoard/Help.elm @@ -23,8 +23,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type) get_html model = (Html.div [ - (Html.Attributes.class "battle-message-board"), - (Html.Attributes.class "battle-message-board-help") + (Html.Attributes.class "message-board"), + (Html.Attributes.class "message-board-help") ] ( case model.help_request of diff --git a/src/battle/src/View/MessageBoard/Help/Guide.elm b/src/battle/src/View/MessageBoard/Help/Guide.elm index 7268c12..38c2a9a 100644 --- a/src/battle/src/View/MessageBoard/Help/Guide.elm +++ b/src/battle/src/View/MessageBoard/Help/Guide.elm @@ -18,7 +18,7 @@ get_header_html title = [] [ (Html.div - [(Html.Attributes.class "battle-help-guide-icon")] + [(Html.Attributes.class "help-guide-icon")] [] ), (Html.text title) diff --git a/src/battle/src/View/MessageBoard/Help/Rank.elm b/src/battle/src/View/MessageBoard/Help/Rank.elm index 4a01e75..9e9a858 100644 --- a/src/battle/src/View/MessageBoard/Help/Rank.elm +++ b/src/battle/src/View/MessageBoard/Help/Rank.elm @@ -14,7 +14,7 @@ import Struct.Event get_guide_icon_html : (Html.Html Struct.Event.Type) get_guide_icon_html = (Html.div - [(Html.Attributes.class "battle-help-guide-icon")] + [(Html.Attributes.class "help-guide-icon")] [] ) @@ -28,10 +28,10 @@ get_header_with_icon_html title rank_name = (Html.div [ (Html.Attributes.class - "battle-message-board-help-figure" + "message-board-help-figure" ), (Html.Attributes.class - ("battle-character-card-" ++ rank_name ++ "-status") + ("character-card-" ++ rank_name ++ "-status") ) ] [] diff --git a/src/battle/src/View/SubMenu.elm b/src/battle/src/View/SubMenu.elm index e661b9c..a010019 100644 --- a/src/battle/src/View/SubMenu.elm +++ b/src/battle/src/View/SubMenu.elm @@ -56,7 +56,7 @@ get_html model = case (Struct.UI.try_getting_displayed_tab model.ui) of (Just tab) -> (Html.div - [(Html.Attributes.class "battle-sub-menu")] + [(Html.Attributes.class "sub-menu")] [(get_inner_html model tab)] ) @@ -66,7 +66,7 @@ get_html model = case (Array.get char_ref model.characters) of (Just char) -> (Html.div - [(Html.Attributes.class "battle-sub-menu")] + [(Html.Attributes.class "sub-menu")] [ (Html.text "Targeting:"), (Html.Lazy.lazy3 diff --git a/src/battle/src/View/SubMenu/Characters.elm b/src/battle/src/View/SubMenu/Characters.elm index 396dbee..e433ab0 100644 --- a/src/battle/src/View/SubMenu/Characters.elm +++ b/src/battle/src/View/SubMenu/Characters.elm @@ -24,7 +24,7 @@ get_character_element_html : ( get_character_element_html player_ix char = (Html.div [ - (Html.Attributes.class "battle-characters-element"), + (Html.Attributes.class "characters-element"), ( if (Struct.Character.is_alive char) then @@ -38,9 +38,9 @@ get_character_element_html player_ix char = ( if (Struct.Character.is_enabled char) then - (Html.Attributes.class "battle-characters-element-active") + (Html.Attributes.class "characters-element-active") else - (Html.Attributes.class "battle-characters-element-inactive") + (Html.Attributes.class "characters-element-inactive") ) ] [ @@ -59,8 +59,8 @@ get_html : ( get_html characters player_ix = (Html.div [ - (Html.Attributes.class "battle-tabmenu-content"), - (Html.Attributes.class "battle-tabmenu-characters-tab") + (Html.Attributes.class "tabmenu-content"), + (Html.Attributes.class "tabmenu-characters-tab") ] (List.map (get_character_element_html player_ix) diff --git a/src/battle/src/View/SubMenu/Settings.elm b/src/battle/src/View/SubMenu/Settings.elm index e0ad4d7..0becac1 100644 --- a/src/battle/src/View/SubMenu/Settings.elm +++ b/src/battle/src/View/SubMenu/Settings.elm @@ -30,8 +30,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type) get_html model = (Html.div [ - (Html.Attributes.class "battle-tabmenu-content"), - (Html.Attributes.class "battle-tabmenu-settings-tab") + (Html.Attributes.class "tabmenu-content"), + (Html.Attributes.class "tabmenu-settings-tab") ] [ (scale_button (0.75) "Zoom -"), diff --git a/src/battle/src/View/SubMenu/Status.elm b/src/battle/src/View/SubMenu/Status.elm index 485704e..afb9f09 100644 --- a/src/battle/src/View/SubMenu/Status.elm +++ b/src/battle/src/View/SubMenu/Status.elm @@ -26,8 +26,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type) get_html model = (Html.div [ - (Html.Attributes.class "battle-footer-tabmenu-content"), - (Html.Attributes.class "battle-footer-tabmenu-content-status") + (Html.Attributes.class "footer-tabmenu-content"), + (Html.Attributes.class "footer-tabmenu-content-status") ] [ (case (Struct.UI.get_previous_action model.ui) of diff --git a/src/battle/src/View/SubMenu/Status/CharacterInfo.elm b/src/battle/src/View/SubMenu/Status/CharacterInfo.elm index 814ce5f..094b8d0 100644 --- a/src/battle/src/View/SubMenu/Status/CharacterInfo.elm +++ b/src/battle/src/View/SubMenu/Status/CharacterInfo.elm @@ -25,7 +25,7 @@ get_html : ( get_html player_ix char = (Html.div [ - (Html.Attributes.class "battle-tabmenu-character-info") + (Html.Attributes.class "tabmenu-character-info") ] [ (Html.text ("Focusing:")), diff --git a/src/battle/src/View/SubMenu/Status/TileInfo.elm b/src/battle/src/View/SubMenu/Status/TileInfo.elm index cace444..1dbe8f6 100644 --- a/src/battle/src/View/SubMenu/Status/TileInfo.elm +++ b/src/battle/src/View/SubMenu/Status/TileInfo.elm @@ -27,11 +27,11 @@ get_icon : (Struct.Tile.Instance -> (Html.Html Struct.Event.Type)) get_icon tile = (Html.div [ - (Html.Attributes.class "battle-tile-card-icon"), - (Html.Attributes.class "battle-info-card-picture"), + (Html.Attributes.class "tile-card-icon"), + (Html.Attributes.class "info-card-picture"), (Html.Attributes.class ( - "battle-tile-variant-" + "tile-variant-" ++ (toString (Struct.Tile.get_local_variant_ix tile)) ) ) @@ -50,9 +50,9 @@ get_name model tile = (Just tile_type) -> (Html.div [ - (Html.Attributes.class "battle-info-card-name"), - (Html.Attributes.class "battle-info-card-text-field"), - (Html.Attributes.class "battle-tile-card-name") + (Html.Attributes.class "info-card-name"), + (Html.Attributes.class "info-card-text-field"), + (Html.Attributes.class "tile-card-name") ] [ (Html.text (Struct.Tile.get_name tile_type)) @@ -72,8 +72,8 @@ get_cost tile = in (Html.div [ - (Html.Attributes.class "battle-info-card-text-field"), - (Html.Attributes.class "battle-tile-card-cost") + (Html.Attributes.class "info-card-text-field"), + (Html.Attributes.class "tile-card-cost") ] [ (Html.text text) @@ -87,8 +87,8 @@ get_location tile = in (Html.div [ - (Html.Attributes.class "battle-info-card-text-field"), - (Html.Attributes.class "battle-tile-card-location") + (Html.Attributes.class "info-card-text-field"), + (Html.Attributes.class "tile-card-location") ] [ (Html.text @@ -110,7 +110,7 @@ get_mod_html mod = in (Html.div [ - (Html.Attributes.class "battle-info-card-mod") + (Html.Attributes.class "info-card-mod") ] [ (Html.text @@ -123,7 +123,7 @@ get_omnimods_listing : (List (String, Int)) -> (Html.Html Struct.Event.Type) get_omnimods_listing mod_list = (Html.div [ - (Html.Attributes.class "battle-info-card-omnimods-listing") + (Html.Attributes.class "info-card-omnimods-listing") ] (List.map (get_mod_html) mod_list) ) @@ -132,7 +132,7 @@ get_omnimods : Struct.Omnimods.Type -> (Html.Html Struct.Event.Type) get_omnimods omnimods = (Html.div [ - (Html.Attributes.class "battle-info-card-omnimods") + (Html.Attributes.class "info-card-omnimods") ] [ (Html.text "Attribute Modifiers"), @@ -158,15 +158,15 @@ get_html model loc = (Just tile) -> (Html.div [ - (Html.Attributes.class "battle-info-card"), - (Html.Attributes.class "battle-tile-card") + (Html.Attributes.class "info-card"), + (Html.Attributes.class "tile-card") ] [ (get_name model tile), (Html.div [ - (Html.Attributes.class "battle-info-card-top"), - (Html.Attributes.class "battle-tile-card-top") + (Html.Attributes.class "info-card-top"), + (Html.Attributes.class "tile-card-top") ] [ (get_icon tile), diff --git a/src/battle/src/View/SubMenu/Timeline.elm b/src/battle/src/View/SubMenu/Timeline.elm index 7fb1813..a0978b5 100644 --- a/src/battle/src/View/SubMenu/Timeline.elm +++ b/src/battle/src/View/SubMenu/Timeline.elm @@ -71,8 +71,8 @@ true_get_html : ( true_get_html characters player_ix turn_results = (Html.div [ - (Html.Attributes.class "battle-tabmenu-content"), - (Html.Attributes.class "battle-tabmenu-timeline-tab") + (Html.Attributes.class "tabmenu-content"), + (Html.Attributes.class "tabmenu-timeline-tab") ] (Array.toList (Array.map diff --git a/src/battle/src/View/SubMenu/Timeline/Attack.elm b/src/battle/src/View/SubMenu/Timeline/Attack.elm index 682540d..6ba8cd0 100644 --- a/src/battle/src/View/SubMenu/Timeline/Attack.elm +++ b/src/battle/src/View/SubMenu/Timeline/Attack.elm @@ -26,7 +26,7 @@ get_title_html : ( get_title_html attacker defender = (Html.div [ - (Html.Attributes.class "battle-timeline-attack-title") + (Html.Attributes.class "timeline-attack-title") ] [ (Html.text @@ -135,8 +135,8 @@ get_html characters player_ix attack = ((Just atkchar), (Just defchar)) -> (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-attack") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-attack") ] ( [ @@ -155,8 +155,8 @@ get_html characters player_ix attack = _ -> (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-attack") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-attack") ] [ (Html.text "Error: Attack with unknown characters") diff --git a/src/battle/src/View/SubMenu/Timeline/Movement.elm b/src/battle/src/View/SubMenu/Timeline/Movement.elm index 0746f1f..e3be53d 100644 --- a/src/battle/src/View/SubMenu/Timeline/Movement.elm +++ b/src/battle/src/View/SubMenu/Timeline/Movement.elm @@ -32,8 +32,8 @@ get_html characters player_ix movement = (Just char) -> (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-movement") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-movement") ] [ (View.Character.get_portrait_html player_ix char), @@ -53,8 +53,8 @@ get_html characters player_ix movement = _ -> (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-movement") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-movement") ] [ (Html.text "Error: Moving with unknown character") diff --git a/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm b/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm index db5e023..1d91c9a 100644 --- a/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm +++ b/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm @@ -23,8 +23,8 @@ get_html : ( get_html pdefeat = (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-player-defeat") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-player-defeat") ] [ (Html.text diff --git a/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm b/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm index a6486fa..233e03c 100644 --- a/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm +++ b/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm @@ -23,8 +23,8 @@ get_html : ( get_html pturns = (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-turn-start") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-turn-start") ] [ (Html.text diff --git a/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm b/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm index 4d47f62..9728f04 100644 --- a/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm +++ b/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm @@ -23,8 +23,8 @@ get_html : ( get_html pvict = (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-player-victory") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-player-victory") ] [ (Html.text diff --git a/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm index 499e0c3..2e874b0 100644 --- a/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm +++ b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm @@ -32,8 +32,8 @@ get_html characters player_ix weapon_switch = (Just char) -> (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-weapon-switch") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-weapon-switch") ] [ (View.Character.get_portrait_html player_ix char), @@ -49,8 +49,8 @@ get_html characters player_ix weapon_switch = _ -> (Html.div [ - (Html.Attributes.class "battle-timeline-element"), - (Html.Attributes.class "battle-timeline-weapon-switch") + (Html.Attributes.class "timeline-element"), + (Html.Attributes.class "timeline-weapon-switch") ] [ (Html.text "Error: Unknown character switched weapons") diff --git a/src/css/src/battle.scss b/src/css/src/battle.scss index a341ce3..c9a7d00 100644 --- a/src/css/src/battle.scss +++ b/src/css/src/battle.scss @@ -1,45 +1,8 @@ -@import 'shared/colors'; -@import 'shared/shadows'; - -* -{ - color: $GOLD-0; - @include text-shadow(1px, $BROWN-0, 0.5); -} - -body -{ - background-color: $BROWN-2; -} - -button -{ - flex: 1; - - text-transform: uppercase; - background-color: $BROWN-3; - border-color: $BROWN-1; -} - -button + button -{ - margin-left: 0.5em; -} - -button:hover -{ - background-color: $BROWN-4; -} - -button:disabled -{ - background-color: $BROWN-0; -} +@import 'shared/battleview'; @import 'battle/controlled-panel'; @import 'battle/info-card'; @import 'battle/keyframes'; -@import 'battle/main-menu'; @import 'battle/map'; @import 'battle/message-board'; @import 'battle/sub-menus'; diff --git a/src/css/src/battle/constants.scss b/src/css/src/battle/constants.scss index 06a1e6b..3e08351 100644 --- a/src/css/src/battle/constants.scss +++ b/src/css/src/battle/constants.scss @@ -1,15 +1,7 @@ -$MENU-MARGIN: 0.5em; -$MENU-PADDING: 0.5em; -$MENU-BORDER: 0.2em; +@import '../shared/battleview/constants'; -$MAIN-MENU-HEIGHT: 3em; -$MESSAGE-BOARD-HEIGHT: 10em; $CONTROLLED-MENU-WIDTH: 15em; $SUB-MENU-WIDTH: 20em; -$MENU-EXTRA: $MENU-MARGIN;// + $MENU-PADDING + $MENU-BORDER; - $NEXT-TO-CONTROLLED-MENU: $CONTROLLED-MENU-WIDTH + $MENU-EXTRA; $NEXT-TO-SUB-MENU: $SUB-MENU-WIDTH + $MENU-EXTRA; -$BELOW-MAIN-MENU: $MAIN-MENU-HEIGHT + $MENU-EXTRA; -$ABOVE-MESSAGE-BOARD: $MESSAGE-BOARD-HEIGHT + $MENU-EXTRA; diff --git a/src/css/src/battle/controlled-panel.scss b/src/css/src/battle/controlled-panel.scss index 7ac39f8..fe6cb13 100644 --- a/src/css/src/battle/controlled-panel.scss +++ b/src/css/src/battle/controlled-panel.scss @@ -1,22 +1,18 @@ +@import '../shared/battleview/constants'; +@import '../shared/battleview/menu-mixins'; + @import 'constants'; -@import 'menu-mixins'; -.battle-controlled +.controlled { - position: absolute; - display: block; + @include menu-panel(); + left: 0; top: $BELOW-MAIN-MENU; bottom: $ABOVE-MESSAGE-BOARD; width: $CONTROLLED-MENU-WIDTH; - @include menu-background-color(); - - @include menu-padding(); - - @include menu-border(); - border-top-left-radius: 0; border-bottom-left-radius: 0; border-left: none; @@ -26,7 +22,7 @@ justify-content: space-between; } -.battle-controlled-actions +.controlled-actions { display: flex; flex-flow: row wrap; @@ -35,7 +31,7 @@ justify-content: center; } -.battle-end-turn-button +.end-turn-button { animation-name: reverse-brown-alarm-bg; animation-duration: 2s; diff --git a/src/css/src/battle/controlled-panel/manual-control.scss b/src/css/src/battle/controlled-panel/manual-control.scss index 765514b..7ab41b6 100644 --- a/src/css/src/battle/controlled-panel/manual-control.scss +++ b/src/css/src/battle/controlled-panel/manual-control.scss @@ -1,4 +1,4 @@ -.battle-manual-controls +.manual-controls { width: 96px; height: 96px; @@ -10,7 +10,7 @@ margin: auto; } -.battle-manual-controls > div +.manual-controls > div { width: 32px; height: 32px; @@ -20,12 +20,12 @@ opacity: 0.5; } -.battle-manual-controls > div:hover +.manual-controls > div:hover { opacity: 1; } -.battle-manual-controls-go +.manual-controls-go { margin: auto; width: 28px; @@ -34,25 +34,25 @@ grid-area: go; } -.battle-manual-controls-up +.manual-controls-up { transform: rotate(-90deg); grid-area: top; } -.battle-manual-controls-down +.manual-controls-down { transform: rotate(90deg); grid-area: bottom; } -.battle-manual-controls-left +.manual-controls-left { transform: rotate(180deg); grid-area: left; } -.battle-manual-controls-right +.manual-controls-right { grid-area: right; } diff --git a/src/css/src/battle/info-card.scss b/src/css/src/battle/info-card.scss index 29e4576..7cb1c08 100644 --- a/src/css/src/battle/info-card.scss +++ b/src/css/src/battle/info-card.scss @@ -1,20 +1,20 @@ @import "../shared/colors"; @import "../shared/shadows"; -.battle-info-card +.info-card { display: flex; flex-flow: column; } -.battle-info-card-top +.info-card-top { position: relative; margin-top: 0.5em; } -.battle-info-card-picture +.info-card-picture { top: 0; left: 0; @@ -31,7 +31,7 @@ display: inline-block; } -.battle-info-card-text-field +.info-card-text-field { display:flex; justify-content:center; @@ -41,7 +41,7 @@ width: 100%; } -.battle-gauge +.gauge { position: relative; border-radius: 5px; @@ -50,7 +50,7 @@ height: 2em; } -.battle-gauge-text +.gauge-text { position: absolute; top: 0; @@ -65,7 +65,7 @@ justify-content: center; } -.battle-gauge-bar +.gauge-bar { position: absolute; top: 0; @@ -79,8 +79,8 @@ transition: width 3s ease-in-out; } -.battle-character-card-health, -.battle-tile-card-cost +.character-card-health, +.tile-card-cost { position: absolute; left: 100px; @@ -90,8 +90,8 @@ } -.battle-character-card-movement, -.battle-tile-card-location +.character-card-movement, +.tile-card-location { position: absolute; left: 100px; diff --git a/src/css/src/battle/info-card/character.scss b/src/css/src/battle/info-card/character.scss index 3233be1..0888c0d 100644 --- a/src/css/src/battle/info-card/character.scss +++ b/src/css/src/battle/info-card/character.scss @@ -1,6 +1,6 @@ @import "../../shared/colors"; -.battle-character-portrait +.character-portrait { background-size: 100% 100%; width: 100px; @@ -9,7 +9,7 @@ cursor: pointer; } -.battle-character-portrait * +.character-portrait * { box-sizing: border-box; background-size: 100% 100%; @@ -17,12 +17,12 @@ height: inherit; } -.battle-character-portrait-body +.character-portrait-body { z-index: 1; } -.battle-character-portrait-armor +.character-portrait-armor { position: relative; z-index: 1; @@ -30,16 +30,16 @@ background-size: 200% 100%; } -.battle-character-portrait-team-0 { background-color: rgba(57, 106, 177, 0.3); } -.battle-character-portrait-team-1 { background-color: rgba(204, 37, 41, 0.3); } -.battle-character-portrait-team-2 { background-color: rgba(62, 150, 81, 0.3); } -.battle-character-portrait-team-3 { background-color: rgba(218, 124, 48, 0.3); } -.battle-character-portrait-team-4 { background-color: rgba(83, 81, 84, 0.3); } -.battle-character-portrait-team-5 { background-color: rgba(107, 76, 154, 0.3); } -.battle-character-portrait-team-6 { background-color: rgba(127, 167, 169, 0.3); } -.battle-character-portrait-team-7 { background-color: rgba(231, 167, 169, 0.3); } +.character-portrait-team-0 { background-color: rgba(57, 106, 177, 0.3); } +.character-portrait-team-1 { background-color: rgba(204, 37, 41, 0.3); } +.character-portrait-team-2 { background-color: rgba(62, 150, 81, 0.3); } +.character-portrait-team-3 { background-color: rgba(218, 124, 48, 0.3); } +.character-portrait-team-4 { background-color: rgba(83, 81, 84, 0.3); } +.character-portrait-team-5 { background-color: rgba(107, 76, 154, 0.3); } +.character-portrait-team-6 { background-color: rgba(127, 167, 169, 0.3); } +.character-portrait-team-7 { background-color: rgba(231, 167, 169, 0.3); } -.battle-character-card-statuses +.character-card-statuses { position: absolute; left: 100px; @@ -49,35 +49,35 @@ display: flex; } -.battle-character-card-status +.character-card-status { height: 1.5em; width: 1.5em; background-size: 100%; } -.battle-character-card-target-status +.character-card-target-status { background-image: url("/asset/svg/status/target.svg"); } -.battle-character-card-commander-status +.character-card-commander-status { background-image: url("/asset/svg/status/commander.svg"); } -.battle-character-card-health > .battle-gauge-bar +.character-card-health > .gauge-bar { background-color: $RED-3; } -.battle-character-card-movement > .battle-gauge-bar +.character-card-movement > .gauge-bar { background-color: $BLUE-3; } -.battle-character-card-weapon, -.battle-character-card-weapon-summary +.character-card-weapon, +.character-card-weapon-summary { display: grid; @@ -87,17 +87,17 @@ margin-top: 0.3em; } -.battle-character-card-weapon +.character-card-weapon { background-color: #6C5D53; } -.battle-character-card-weapon-summary +.character-card-weapon-summary { background-color: $BROWN-1; } -.battle-character-card-armor +.character-card-armor { display: grid; border-radius: 5px; @@ -107,20 +107,20 @@ margin-top: 0.3em; } -.battle-character-card-armor-stats +.character-card-armor-stats { display: flex; flex-direction: row; flex-wrap: wrap; } -.battle-character-card-stats > *, -.battle-character-card-armor-stats > * +.character-card-stats > *, +.character-card-armor-stats > * { width: 25%; } -.battle-character-card-stats +.character-card-stats { display: flex; flex-direction: row; diff --git a/src/css/src/battle/info-card/tile.scss b/src/css/src/battle/info-card/tile.scss index ab8b1a0..8a6e1e1 100644 --- a/src/css/src/battle/info-card/tile.scss +++ b/src/css/src/battle/info-card/tile.scss @@ -1,5 +1,5 @@ -.battle-tile-card-icon +.tile-card-icon { position: relative; width: 80px; @@ -7,7 +7,7 @@ display: inline-block; } -.battle-tile-card-icon * +.tile-card-icon * { position: absolute; @@ -16,7 +16,7 @@ height: 80px; } -.battle-tile-card-top +.tile-card-top { margin:0.3em; } diff --git a/src/css/src/battle/main-menu.scss b/src/css/src/battle/main-menu.scss deleted file mode 100644 index ac43c29..0000000 --- a/src/css/src/battle/main-menu.scss +++ /dev/null @@ -1,37 +0,0 @@ -@import '../shared/colors'; - -@import 'constants'; -@import 'menu-mixins'; - -.battle-main-menu -{ - position: absolute; - top: 0; - left: 0; - right: 0; - - height: $MAIN-MENU-HEIGHT; - - @include menu-background-color(); - - display: flex; - flex-direction: row; - flex-wrap: wrap; - - @include menu-border(); - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; - - @include menu-padding(); - - @include menu-margin(); - - margin-top: 0; - - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-between; -} - diff --git a/src/css/src/battle/map.scss b/src/css/src/battle/map.scss index c6ab64d..9b95adf 100644 --- a/src/css/src/battle/map.scss +++ b/src/css/src/battle/map.scss @@ -1,7 +1,9 @@ +@import '../shared/battleview/constants'; +@import '../shared/battleview/menu-mixins'; + @import 'constants'; -@import 'menu-mixins'; -.battle-container-centerer +.container-centerer { position: absolute; @@ -13,7 +15,7 @@ display: flex; } -.battle-container +.container { display: inline-block; max-height: 100%; @@ -29,7 +31,7 @@ @include menu-background-color(); } -.battle-actual +.actual { display: inline-block; transform-origin: top left; @@ -38,7 +40,7 @@ position: relative; } -.battle-tiled, .battle-tiled * +.tiled, .tiled * { height: 32px; width: 32px; @@ -47,31 +49,31 @@ /* max-width: 32px; */ } -.battle-tile-icon, .battle-tile-icon * +.tile-icon, .tile-icon * { z-index: 0; position: absolute; background-size: 400%; } -.battle-path-icon-below-markers {z-index: 1;} -.battle-marker-icon {z-index: 2;} -.battle-path-icon-above-markers {z-index: 3;} -.battle-character-icon {z-index: 4;} +.path-icon-below-markers {z-index: 1;} +.marker-icon {z-index: 2;} +.path-icon-above-markers {z-index: 3;} +.character-icon {z-index: 4;} -.battle-marker-icon, -.battle-character-icon, -.battle-path-icon +.marker-icon, +.character-icon, +.path-icon { position: absolute; } -.battle-tiles-layer +.tiles-layer { /*display: table; */ } -.battle-tiles-layer-row +.tiles-layer-row { /* display: table-row; */ } diff --git a/src/css/src/battle/map/animation.scss b/src/css/src/battle/map/animation.scss index 1e8f044..eef2913 100644 --- a/src/css/src/battle/map/animation.scss +++ b/src/css/src/battle/map/animation.scss @@ -1,4 +1,4 @@ -.battle-animated-character-icon +.animated-character-icon { transition: top linear 0.3s, left linear 0.3s; } diff --git a/src/css/src/battle/map/character.scss b/src/css/src/battle/map/character.scss index 6856f61..44fb744 100644 --- a/src/css/src/battle/map/character.scss +++ b/src/css/src/battle/map/character.scss @@ -1,11 +1,11 @@ -.battle-character-icon +.character-icon { border-radius: 5px; height: 38px; margin-top: -6px; } -.battle-character-icon * +.character-icon * { position: absolute; left: 0; @@ -15,7 +15,7 @@ height: inherit; } -.battle-character-icon-enabled +.character-icon-enabled { animation-name: pulsating; animation-duration: 1.5s; @@ -23,25 +23,25 @@ transform-origin: center; } -.battle-character-icon-banner { z-index: 2; } -.battle-character-icon-head { z-index: 1; } -.battle-character-icon-body { z-index: 0; } +.character-icon-banner { z-index: 2; } +.character-icon-head { z-index: 1; } +.character-icon-body { z-index: 0; } -.battle-character-ally +.character-ally { } -.battle-character-enemy +.character-enemy { transform: scale(-1, 1); } -.battle-character-ally.battle-character-icon-disabled +.character-ally.character-icon-disabled { filter: contrast(35%); } -.battle-character-targeted +.character-targeted { background-color: rgba(255,0,0,0.7); animation-name: red-alarm-bg; @@ -49,7 +49,7 @@ animation-iteration-count: infinite; } -.battle-character-selected +.character-selected { animation-name: strongly-pulsating; animation-duration: 1.5s; diff --git a/src/css/src/battle/map/marker.scss b/src/css/src/battle/map/marker.scss index d6ec557..b946bc8 100644 --- a/src/css/src/battle/map/marker.scss +++ b/src/css/src/battle/map/marker.scss @@ -1,4 +1,4 @@ -.battle-marker-icon.battle-navigator-non-interactive +.marker-icon.navigator-non-interactive { box-sizing: border-box; width: 12px; @@ -7,7 +7,7 @@ margin: 10px; } -.battle-marker-icon.battle-navigator-interactive +.marker-icon.navigator-interactive { box-sizing: border-box; width: 24px; @@ -24,14 +24,14 @@ 0px -1px 2px #333; } -.battle-can-go-to-can-defend-marker.battle-navigator-interactive +.can-go-to-can-defend-marker.navigator-interactive { background-color: #FFF; opacity: 0.3; transition: opacity 0.3s ease-out; } -.battle-can-go-to-cant-defend-marker.battle-navigator-interactive +.can-go-to-cant-defend-marker.navigator-interactive { background: repeating-linear-gradient( @@ -45,13 +45,13 @@ transition: opacity 0.3s ease-out; } -.battle-can-go-to-can-defend-marker.battle-navigator-interactive:hover, -.battle-can-go-to-cant-defend-marker.battle-navigator-interactive:hover +.can-go-to-can-defend-marker.navigator-interactive:hover, +.can-go-to-cant-defend-marker.navigator-interactive:hover { opacity: 0.9; } -.battle-can-attack-can-defend-marker.battle-navigator-interactive +.can-attack-can-defend-marker.navigator-interactive { background-color: #000; opacity: 0.7; @@ -63,7 +63,7 @@ border-radius: 0; } -.battle-can-attack-cant-defend-marker.battle-navigator-interactive +.can-attack-cant-defend-marker.navigator-interactive { background: repeating-linear-gradient( @@ -82,13 +82,13 @@ border-radius: 0; } -.battle-can-attack-can-defend-marker.battle-navigator-non-interactive +.can-attack-can-defend-marker.navigator-non-interactive { z-index: 5; background-image: url(/asset/svg/marker/blade.svg); } -.battle-can-attack-cant-defend-marker.battle-navigator-non-interactive +.can-attack-cant-defend-marker.navigator-non-interactive { z-index: 5; background-image: @@ -96,15 +96,15 @@ url(/asset/svg/marker/brokenshield.svg); } -.battle-can-go-to-cant-defend-marker.battle-navigator-non-interactive +.can-go-to-cant-defend-marker.navigator-non-interactive { background-image: url(/asset/svg/marker/pawprint.svg), url(/asset/svg/marker/brokenshield.svg); } -.battle-can-attack-cant-defend-marker.battle-navigator-non-interactive, -.battle-can-go-to-cant-defend-marker.battle-navigator-non-interactive +.can-attack-cant-defend-marker.navigator-non-interactive, +.can-go-to-cant-defend-marker.navigator-non-interactive { width: 24px; height: 24px; @@ -114,24 +114,24 @@ margin: 2px; } -.battle-can-go-to-can-defend-marker.battle-navigator-non-interactive +.can-go-to-can-defend-marker.navigator-non-interactive { background-image: url(/asset/svg/marker/pawprint.svg); } -.battle-can-attack-can-defend-marker.battle-navigator-non-interactive, -.battle-can-attack-cant-defend-marker.battle-navigator-non-interactive +.can-attack-can-defend-marker.navigator-non-interactive, +.can-attack-cant-defend-marker.navigator-non-interactive { z-index: 5; } -.battle-can-go-to-can-defend-marker, -.battle-can-go-to-cant-defend-marker +.can-go-to-can-defend-marker, +.can-go-to-cant-defend-marker { z-index: 3; } -.battle-cant-defend-marker +.cant-defend-marker { background: repeating-linear-gradient( diff --git a/src/css/src/battle/map/path.scss b/src/css/src/battle/map/path.scss index 0d0b97d..f01176e 100644 --- a/src/css/src/battle/map/path.scss +++ b/src/css/src/battle/map/path.scss @@ -1,88 +1,88 @@ -.battle-path-icon +.path-icon { background-image: url("/asset/svg/arrows.svg"); background-size: 96px 32px; } -.battle-path-icon-UR, -.battle-path-icon-LD, -.battle-path-icon-RD, -.battle-path-icon-UL, -.battle-path-icon-LU, -.battle-path-icon-DR, -.battle-path-icon-DL, -.battle-path-icon-RU +.path-icon-UR, +.path-icon-LD, +.path-icon-RD, +.path-icon-UL, +.path-icon-LU, +.path-icon-DR, +.path-icon-DL, +.path-icon-RU { /*** Default is -^ ***/ background-position: 64px 0; } /*** DL/RU ***/ -.battle-path-icon-LU, -.battle-path-icon-DR +.path-icon-LU, +.path-icon-DR { transform: rotate(90deg); } -.battle-path-icon-RD, -.battle-path-icon-UL +.path-icon-RD, +.path-icon-UL { /*** ***/ transform: scale(1, -1); } -.battle-path-icon-UR, -.battle-path-icon-LD +.path-icon-UR, +.path-icon-LD { /*** <| ***/ transform: rotate(180deg); } -.battle-path-icon-RR, -.battle-path-icon-LR, -.battle-path-icon-RL, -.battle-path-icon-LL +.path-icon-RR, +.path-icon-LR, +.path-icon-RL, +.path-icon-LL { background-position: 0 0; } -.battle-path-icon-markN, -.battle-path-icon-NU, -.battle-path-icon-ND, -.battle-path-icon-NL, -.battle-path-icon-NR +.path-icon-markN, +.path-icon-NU, +.path-icon-ND, +.path-icon-NL, +.path-icon-NR { display: none; } -.battle-path-icon-UU, -.battle-path-icon-UD, -.battle-path-icon-DU, -.battle-path-icon-DD +.path-icon-UU, +.path-icon-UD, +.path-icon-DU, +.path-icon-DD { background-position: 0 0; transform: rotate(90deg); } -.battle-path-icon-markR, -.battle-path-icon-markL, -.battle-path-icon-markU, -.battle-path-icon-markD +.path-icon-markR, +.path-icon-markL, +.path-icon-markU, +.path-icon-markD { background-position: 32px 0; } -.battle-path-icon-markL +.path-icon-markL { transform: rotate(180deg); } -.battle-path-icon-markD +.path-icon-markD { transform: rotate(90deg); } -.battle-path-icon-markU +.path-icon-markU { transform: rotate(-90deg); } diff --git a/src/css/src/battle/map/variant.scss b/src/css/src/battle/map/variant.scss index 58f9915..253d5e3 100644 --- a/src/css/src/battle/map/variant.scss +++ b/src/css/src/battle/map/variant.scss @@ -1,33 +1,33 @@ -.battle-tile-variant-0 * {background-position: 0 0;} -.battle-tile-variant-1 * {background-position: 100% 0;} -.battle-tile-variant-2 * {background-position: 200% 0;} -.battle-tile-variant-3 * {background-position: 300% 0;} +.tile-variant-0 * {background-position: 0 0;} +.tile-variant-1 * {background-position: 100% 0;} +.tile-variant-2 * {background-position: 200% 0;} +.tile-variant-3 * {background-position: 300% 0;} -.battle-tile-variant-4 * {background-position: 0 100%;} -.battle-tile-variant-5 * {background-position: 100% 100%;} -.battle-tile-variant-6 * {background-position: 200% 100%;} -.battle-tile-variant-7 * {background-position: 300% 100%;} +.tile-variant-4 * {background-position: 0 100%;} +.tile-variant-5 * {background-position: 100% 100%;} +.tile-variant-6 * {background-position: 200% 100%;} +.tile-variant-7 * {background-position: 300% 100%;} -.battle-tile-variant-8 * {background-position: 0 200%;} -.battle-tile-variant-9 * {background-position: 100% 200%;} -.battle-tile-variant-10 * {background-position: 200% 200%;} -.battle-tile-variant-11 * {background-position: 300% 200%;} +.tile-variant-8 * {background-position: 0 200%;} +.tile-variant-9 * {background-position: 100% 200%;} +.tile-variant-10 * {background-position: 200% 200%;} +.tile-variant-11 * {background-position: 300% 200%;} -.battle-tile-variant-12 * {background-position: 0 300%;} -.battle-tile-variant-13 * {background-position: 100% 300%;} -.battle-tile-variant-14 * {background-position: 200% 300%;} -.battle-tile-variant-15 * {background-position: 300% 300%;} +.tile-variant-12 * {background-position: 0 300%;} +.tile-variant-13 * {background-position: 100% 300%;} +.tile-variant-14 * {background-position: 200% 300%;} +.tile-variant-15 * {background-position: 300% 300%;} -.battle-tile-icon-bg { z-index: 0; } -.battle-tile-icon-dt { z-index: 9; } +.tile-icon-bg { z-index: 0; } +.tile-icon-dt { z-index: 9; } -.battle-tile-icon-f-0 { z-index: 1; } -.battle-tile-icon-f-1 { z-index: 2; } -.battle-tile-icon-f-2 { z-index: 3; } -.battle-tile-icon-f-3 { z-index: 4; } -.battle-tile-icon-f-4 { z-index: 5; } -.battle-tile-icon-f-5 { z-index: 6; } -.battle-tile-icon-f-6 { z-index: 7; } -.battle-tile-icon-f-7 { z-index: 8; } +.tile-icon-f-0 { z-index: 1; } +.tile-icon-f-1 { z-index: 2; } +.tile-icon-f-2 { z-index: 3; } +.tile-icon-f-3 { z-index: 4; } +.tile-icon-f-4 { z-index: 5; } +.tile-icon-f-5 { z-index: 6; } +.tile-icon-f-6 { z-index: 7; } +.tile-icon-f-7 { z-index: 8; } diff --git a/src/css/src/battle/message-board.scss b/src/css/src/battle/message-board.scss index f2be3f7..6274619 100644 --- a/src/css/src/battle/message-board.scss +++ b/src/css/src/battle/message-board.scss @@ -1,45 +1 @@ -@import 'constants'; -@import 'menu-mixins'; - -.battle-message-board -{ - position: absolute; - bottom: 0; - left: 0; - right: 0; - - height: $MESSAGE-BOARD-HEIGHT; - - @include menu-background-color(); - - @include menu-border(); - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - - @include menu-padding(); - - @include menu-margin(); - margin-bottom: 0; - - display: flex; - flex-flow: row; - justify-content: space-between; - - overflow-y: auto; -} - -/* -.battle-message-board -{ - background: $BROWN-4; - color: $BROWN-0; - line-height: 1.3em; - font-size: 1.2em; - text-shadow: none; -} -*/ - @import 'message-board/attack'; -@import 'message-board/error'; -@import 'message-board/help'; diff --git a/src/css/src/battle/message-board/attack.scss b/src/css/src/battle/message-board/attack.scss index 8f3a8cb..949ae40 100644 --- a/src/css/src/battle/message-board/attack.scss +++ b/src/css/src/battle/message-board/attack.scss @@ -1,9 +1,9 @@ -.battle-message-board .battle-character-card +.message-board .character-card { width: 16em; } -.battle-message-attack-text +.message-attack-text { width: 100%; text-align: center; @@ -11,43 +11,43 @@ } /**** Character Portrait Animations *******************************************/ -.battle-animated-portrait-damaged .battle-character-portrait > * +.animated-portrait-damaged .character-portrait > * { animation: blinking 0.2s steps(2, start) 8; } -.battle-animated-portrait-absent .battle-character-portrait > * +.animated-portrait-absent .character-portrait > * { visibility: hidden; } -.battle-animated-portrait-dodges .battle-character-portrait, -.battle-animated-portrait-dies .battle-character-portrait, -.battle-animated-portrait-parries .battle-character-portrait, -.battle-animated-portrait-attacks .battle-character-portrait +.animated-portrait-dodges .character-portrait, +.animated-portrait-dies .character-portrait, +.animated-portrait-parries .character-portrait, +.animated-portrait-attacks .character-portrait { overflow: hidden; } -.battle-animated-portrait +.animated-portrait { } -.battle-animated-portrait-dodges .battle-character-portrait > * +.animated-portrait-dodges .character-portrait > * { animation-name: dodges; animation-duration: 1s; animation-iteration-count: 1; } -.battle-animated-portrait-attacks .battle-character-portrait > * +.animated-portrait-attacks .character-portrait > * { animation-name: attacks; animation-duration: 1s; animation-iteration-count: 1; } -.battle-animated-portrait-dies .battle-character-portrait > * +.animated-portrait-dies .character-portrait > * { animation-name: blinking2, dies; animation-duration: 0.15s, 2s; @@ -55,7 +55,7 @@ animation-iteration-count: 8, 1; } -.battle-animated-portrait-parries .battle-character-portrait > * +.animated-portrait-parries .character-portrait > * { animation-name: parries; animation-duration: 1s; diff --git a/src/css/src/battle/message-board/error.scss b/src/css/src/battle/message-board/error.scss deleted file mode 100644 index 8c2c197..0000000 --- a/src/css/src/battle/message-board/error.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '../../shared/colors'; - -.battle-error -{ - background-color: $RED-1; -} - diff --git a/src/css/src/battle/message-board/help.scss b/src/css/src/battle/message-board/help.scss deleted file mode 100644 index ba35772..0000000 --- a/src/css/src/battle/message-board/help.scss +++ /dev/null @@ -1,33 +0,0 @@ -.battle-message-board-help -{ - display: block; -} - -.battle-message-board-help h1 -{ - margin: 0; - margin-bottom: 0.3em; - font-size: 1.5em; - text-align: center; -} - -.battle-message-board-help-figure -{ - width: 1.5em; - height: 1.5em; - background-size: 100%; - display: inline-block; - vertical-align: middle; -} - -.battle-help-guide-icon -{ - margin-right: 0.5em; - width: 1.5em; - height: 1.5em; - background-image: url("/asset/svg/help-icon.svg"); - background-size: 100%; - display: inline-block; - vertical-align: middle; -} - diff --git a/src/css/src/battle/sub-menus.scss b/src/css/src/battle/sub-menus.scss index 13ec571..d302a4f 100644 --- a/src/css/src/battle/sub-menus.scss +++ b/src/css/src/battle/sub-menus.scss @@ -1,20 +1,18 @@ +@import '../shared/battleview/constants'; +@import '../shared/battleview/menu-mixins'; + @import 'constants'; -@import 'menu-mixins'; -.battle-sub-menu +.sub-menu { - position: absolute; + @include menu-panel(); + right: 0; top: $BELOW-MAIN-MENU; bottom: $ABOVE-MESSAGE-BOARD; width: $SUB-MENU-WIDTH; - @include menu-background-color(); - - @include menu-padding(); - - @include menu-border(); border-top-right-radius: 0; border-bottom-right-radius: 0; border-right: none; diff --git a/src/css/src/battle/sub-menus/characters-tab.scss b/src/css/src/battle/sub-menus/characters-tab.scss index fc4aae6..3371587 100644 --- a/src/css/src/battle/sub-menus/characters-tab.scss +++ b/src/css/src/battle/sub-menus/characters-tab.scss @@ -1,6 +1,6 @@ @import '../../shared/colors'; -.battle-tabmenu-characters-tab +.tabmenu-characters-tab { display: flex; flex-grow: 1; @@ -8,14 +8,14 @@ flex-wrap: wrap; } -.battle-characters-element-active +.characters-element-active { animation-name: brown-alarm-bg; animation-duration: 5s; animation-iteration-count: infinite; } -.battle-characters-element +.characters-element { flex: 2; margin: 0.5em 0.5em 0 0.5em; diff --git a/src/css/src/battle/sub-menus/timeline-tab.scss b/src/css/src/battle/sub-menus/timeline-tab.scss index 91dc8db..23c664b 100644 --- a/src/css/src/battle/sub-menus/timeline-tab.scss +++ b/src/css/src/battle/sub-menus/timeline-tab.scss @@ -1,7 +1,7 @@ @import '../../shared/colors'; @import '../../shared/shadows'; -.battle-timeline-element +.timeline-element { margin: 0.5em 0.5em 0 0.5em; text-align: center; @@ -12,7 +12,7 @@ padding: 0.5em; } -.battle-timeline-element .battle-character-portrait +.timeline-element .character-portrait { display: inline-block; vertical-align: middle; @@ -24,7 +24,7 @@ @include box-shadow(1px, $BROWN-0, 1); } -.battle-timeline-element .battle-character-portrait + * +.timeline-element .character-portrait + * { margin-left: 1em; } diff --git a/src/css/src/landing.scss b/src/css/src/landing.scss index 02f454a..a29dc65 100644 --- a/src/css/src/landing.scss +++ b/src/css/src/landing.scss @@ -15,12 +15,12 @@ html, body, .fullscreen-module min-height: 450px; } -.main-server-version +.server-version { font-size: 1em; } -.main-server-logo img +.server-logo img { height: 15em; } diff --git a/src/css/src/login.scss b/src/css/src/login.scss index e25f40a..ed6f5e8 100644 --- a/src/css/src/login.scss +++ b/src/css/src/login.scss @@ -1,5 +1,6 @@ @import 'shared/colors'; @import 'shared/shadows'; +@import 'shared/general-header'; * { @@ -22,8 +23,6 @@ body, padding-bottom: 1em; } -@import 'shared/general-header'; - main { position: relative; diff --git a/src/css/src/map-editor.scss b/src/css/src/map-editor.scss index 711e612..8be26ab 100644 --- a/src/css/src/map-editor.scss +++ b/src/css/src/map-editor.scss @@ -1,45 +1,5 @@ -@import 'shared/colors'; -@import 'shared/shadows'; +@import 'shared/battleview'; -* -{ - color: $GOLD-0; - @include text-shadow(1px, $BROWN-0, 0.5); -} - -body -{ - background-color: $BROWN-2; -} - -button -{ - flex: 1; - - text-transform: uppercase; - background-color: $BROWN-3; - border-color: $BROWN-1; -} - -button + button -{ - margin-left: 0.5em; -} - -button:hover -{ - background-color: $BROWN-4; -} - -button:disabled -{ - background-color: $BROWN-0; -} - - -//@import 'map-editor/info-card'; -@import 'map-editor/main-menu'; @import 'map-editor/map'; -@import 'map-editor/message-board'; @import 'map-editor/sub-menus'; @import 'map-editor/toolbox'; diff --git a/src/css/src/map-editor/constants.scss b/src/css/src/map-editor/constants.scss index 9c46e20..a8f67d3 100644 --- a/src/css/src/map-editor/constants.scss +++ b/src/css/src/map-editor/constants.scss @@ -1,15 +1,7 @@ -$MENU-MARGIN: 0.5em; -$MENU-PADDING: 0.5em; -$MENU-BORDER: 0.2em; +@import '../shared/battleview/constants'; -$MAIN-MENU-HEIGHT: 3em; -$MESSAGE-BOARD-HEIGHT: 10em; $TOOLBOX-MENU-WIDTH: 15em; $SUB-MENU-WIDTH: 20em; -$MENU-EXTRA: $MENU-MARGIN;// + $MENU-PADDING + $MENU-BORDER; - $NEXT-TO-TOOLBOX-MENU: $TOOLBOX-MENU-WIDTH + $MENU-EXTRA; $NEXT-TO-SUB-MENU: $SUB-MENU-WIDTH + $MENU-EXTRA; -$BELOW-MAIN-MENU: $MAIN-MENU-HEIGHT + $MENU-EXTRA; -$ABOVE-MESSAGE-BOARD: $MESSAGE-BOARD-HEIGHT + $MENU-EXTRA; diff --git a/src/css/src/map-editor/map.scss b/src/css/src/map-editor/map.scss index afa5bde..66c0207 100644 --- a/src/css/src/map-editor/map.scss +++ b/src/css/src/map-editor/map.scss @@ -1,5 +1,7 @@ +@import '../shared/battleview/constants'; +@import '../shared/battleview/menu-mixins'; + @import 'constants'; -@import 'menu-mixins'; .map-container-centerer { diff --git a/src/css/src/map-editor/menu-mixins.scss b/src/css/src/map-editor/menu-mixins.scss deleted file mode 100644 index f7129a1..0000000 --- a/src/css/src/map-editor/menu-mixins.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import '../shared/colors'; - -@import 'constants'; - -@mixin menu-border () -{ - border: $MENU-BORDER solid $BROWN-1; - border-radius: 15px; -} - -@mixin menu-margin () -{ - margin: $MENU-MARGIN; -} - -@mixin menu-padding () -{ - padding: $MENU-PADDING; -} - -@mixin menu-background-color () -{ - background-color: $BROWN-3; -} diff --git a/src/css/src/map-editor/message-board/error.scss b/src/css/src/map-editor/message-board/error.scss deleted file mode 100644 index ddfa4ba..0000000 --- a/src/css/src/map-editor/message-board/error.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '../../shared/colors'; - -.map-error -{ - background-color: $RED-1; -} - diff --git a/src/css/src/map-editor/sub-menus.scss b/src/css/src/map-editor/sub-menus.scss index 269ac83..d526238 100644 --- a/src/css/src/map-editor/sub-menus.scss +++ b/src/css/src/map-editor/sub-menus.scss @@ -1,20 +1,18 @@ +@import '../shared/battleview/constants'; +@import '../shared/battleview/menu-mixins'; + @import 'constants'; -@import 'menu-mixins'; -.map-sub-menu +.sub-menu { - position: absolute; + @include menu-panel(); + right: 0; top: $BELOW-MAIN-MENU; bottom: $ABOVE-MESSAGE-BOARD; width: $SUB-MENU-WIDTH; - @include menu-background-color(); - - @include menu-padding(); - - @include menu-border(); border-top-right-radius: 0; border-bottom-right-radius: 0; border-right: none; diff --git a/src/css/src/map-editor/toolbox.scss b/src/css/src/map-editor/toolbox.scss index 77c59f1..16d54e8 100644 --- a/src/css/src/map-editor/toolbox.scss +++ b/src/css/src/map-editor/toolbox.scss @@ -1,21 +1,17 @@ +@import '../shared/battleview/constants'; +@import '../shared/battleview/menu-mixins'; + @import 'constants'; -@import 'menu-mixins'; .map-toolbox { - position: absolute; - display: block; left: 0; top: $BELOW-MAIN-MENU; bottom: $ABOVE-MESSAGE-BOARD; width: $TOOLBOX-MENU-WIDTH; - @include menu-background-color(); - - @include menu-padding(); - - @include menu-border(); + @include menu-panel(); border-top-left-radius: 0; border-bottom-left-radius: 0; diff --git a/src/css/src/shared/battleview.scss b/src/css/src/shared/battleview.scss new file mode 100644 index 0000000..fc80bee --- /dev/null +++ b/src/css/src/shared/battleview.scss @@ -0,0 +1,17 @@ +@import 'colors'; +@import 'shadows'; + +* +{ + color: $GOLD-0; + @include text-shadow(1px, $BROWN-0, 0.5); +} + +body +{ + background-color: $BROWN-2; +} + +@import 'battleview/button'; +@import 'battleview/main-menu'; +@import 'battleview/message-board'; diff --git a/src/css/src/shared/battleview/button.scss b/src/css/src/shared/battleview/button.scss new file mode 100644 index 0000000..75788ca --- /dev/null +++ b/src/css/src/shared/battleview/button.scss @@ -0,0 +1,27 @@ +@import '../colors'; + +button +{ + /** FIXME not everywhere **/ + flex: 1; + + text-transform: uppercase; + background-color: $BROWN-3; + border-color: $BROWN-1; +} + +/** FIXME not everywhere **/ +button + button +{ + margin-left: 0.5em; +} + +button:hover +{ + background-color: $BROWN-4; +} + +button:disabled +{ + background-color: $BROWN-0; +} diff --git a/src/css/src/shared/battleview/constants.scss b/src/css/src/shared/battleview/constants.scss new file mode 100644 index 0000000..63d4bbf --- /dev/null +++ b/src/css/src/shared/battleview/constants.scss @@ -0,0 +1,10 @@ +$MENU-MARGIN: 0.5em; +$MENU-PADDING: 0.5em; +$MENU-BORDER: 0.2em; +$MENU-EXTRA: $MENU-MARGIN;// + $MENU-PADDING + $MENU-BORDER; + +$MAIN-MENU-HEIGHT: 3em; +$MESSAGE-BOARD-HEIGHT: 10em; + +$BELOW-MAIN-MENU: $MAIN-MENU-HEIGHT + $MENU-EXTRA; +$ABOVE-MESSAGE-BOARD: $MESSAGE-BOARD-HEIGHT + $MENU-EXTRA; diff --git a/src/css/src/map-editor/main-menu.scss b/src/css/src/shared/battleview/main-menu.scss index 4d4a488..fd5db10 100644 --- a/src/css/src/map-editor/main-menu.scss +++ b/src/css/src/shared/battleview/main-menu.scss @@ -1,9 +1,9 @@ -@import '../shared/colors'; +@import '../colors'; @import 'constants'; @import 'menu-mixins'; -.map-main-menu +.main-menu { position: absolute; top: 0; @@ -34,3 +34,4 @@ flex-wrap: wrap; justify-content: space-between; } + diff --git a/src/css/src/battle/menu-mixins.scss b/src/css/src/shared/battleview/menu-mixins.scss index f7129a1..235671f 100644 --- a/src/css/src/battle/menu-mixins.scss +++ b/src/css/src/shared/battleview/menu-mixins.scss @@ -1,4 +1,4 @@ -@import '../shared/colors'; +@import '../colors'; @import 'constants'; @@ -22,3 +22,15 @@ { background-color: $BROWN-3; } + +@mixin menu-panel () +{ + position: absolute; + display: block; + + @include menu-background-color(); + + @include menu-padding(); + + @include menu-border(); +} diff --git a/src/css/src/map-editor/message-board.scss b/src/css/src/shared/battleview/message-board.scss index 22720e8..0fc9fa7 100644 --- a/src/css/src/map-editor/message-board.scss +++ b/src/css/src/shared/battleview/message-board.scss @@ -1,7 +1,7 @@ @import 'constants'; @import 'menu-mixins'; -.map-message-board +.message-board { position: absolute; bottom: 0; @@ -29,16 +29,5 @@ overflow-y: auto; } -/* -.map-message-board -{ - background: $BROWN-4; - color: $BROWN-0; - line-height: 1.3em; - font-size: 1.2em; - text-shadow: none; -} -*/ - @import 'message-board/error'; @import 'message-board/help'; diff --git a/src/css/src/shared/battleview/message-board/error.scss b/src/css/src/shared/battleview/message-board/error.scss new file mode 100644 index 0000000..10b9eda --- /dev/null +++ b/src/css/src/shared/battleview/message-board/error.scss @@ -0,0 +1,7 @@ +@import '../../colors'; + +.error +{ + background-color: $RED-1; +} + diff --git a/src/css/src/map-editor/message-board/help.scss b/src/css/src/shared/battleview/message-board/help.scss index 7ffc576..bb66c33 100644 --- a/src/css/src/map-editor/message-board/help.scss +++ b/src/css/src/shared/battleview/message-board/help.scss @@ -1,9 +1,9 @@ -.map-message-board-help +.message-board-help { display: block; } -.map-message-board-help h1 +.message-board-help h1 { margin: 0; margin-bottom: 0.3em; @@ -11,7 +11,7 @@ text-align: center; } -.map-message-board-help-figure +.message-board-help-figure { width: 1.5em; height: 1.5em; @@ -20,7 +20,7 @@ vertical-align: middle; } -.map-help-guide-icon +.help-guide-icon { margin-right: 0.5em; width: 1.5em; |