| summaryrefslogtreecommitdiff | 
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-08-07 20:12:45 +0200 | 
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-08-07 20:12:45 +0200 | 
| commit | e02a6d61f15ae14e89ddde03f4af5a6d9c8b51c0 (patch) | |
| tree | ee8735e53cbe56dfb0279d05096a98e481b0b813 /src/battle | |
| parent | c255684ad2f8257e01855edf13df8d2aece259dc (diff) | |
Moving to SCSS, theme improvements, index p. txt
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/src/View/Controlled/CharacterCard.elm | 35 | ||||
| -rw-r--r-- | src/battle/src/View/SubMenu/Status/TileInfo.elm | 7 | ||||
| -rw-r--r-- | src/battle/www/index.html | 4 | 
3 files changed, 41 insertions, 5 deletions
| diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm index b53ae57..0e29502 100644 --- a/src/battle/src/View/Controlled/CharacterCard.elm +++ b/src/battle/src/View/Controlled/CharacterCard.elm @@ -37,6 +37,8 @@ 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")        ]        [ @@ -487,6 +489,8 @@ 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")        ] @@ -494,10 +498,18 @@ get_minimal_html player_ix char =           (get_name char),           (Html.div              [ +               (Html.Attributes.class "battle-info-card-top"),                 (Html.Attributes.class "battle-character-card-top")              ]              [ -               (View.Character.get_portrait_html player_ix char), +               (Html.div +                  [ +                     (Html.Attributes.class "battle-info-card-picture") +                  ] +                  [ +                     (View.Character.get_portrait_html player_ix char) +                  ] +               ),                 (get_health_bar char),                 (get_inactive_movement_bar char),                 (get_statuses char) @@ -527,10 +539,18 @@ get_summary_html char_turn player_ix char =              (get_name char),              (Html.div                 [ +                  (Html.Attributes.class "battle-info-card-top"),                    (Html.Attributes.class "battle-character-card-top")                 ]                 [ -                  (View.Character.get_portrait_html player_ix char), +                  (Html.div +                     [ +                        (Html.Attributes.class "battle-info-card-picture") +                     ] +                     [ +                        (View.Character.get_portrait_html player_ix char) +                     ] +                  ),                    (get_health_bar char),                    (get_movement_bar char_turn char),                    (get_statuses char) @@ -558,16 +578,25 @@ get_full_html player_ix char =     in        (Html.div           [ +            (Html.Attributes.class "battle-info-card"),              (Html.Attributes.class "battle-character-card")           ]           [              (get_name char),              (Html.div                 [ +                  (Html.Attributes.class "battle-info-card-top"),                    (Html.Attributes.class "battle-character-card-top")                 ]                 [ -                  (View.Character.get_portrait_html player_ix char), +                  (Html.div +                     [ +                        (Html.Attributes.class "battle-info-card-picture") +                     ] +                     [ +                        (View.Character.get_portrait_html player_ix char) +                     ] +                  ),                    (get_health_bar char),                    (get_inactive_movement_bar char),                    (get_statuses char) diff --git a/src/battle/src/View/SubMenu/Status/TileInfo.elm b/src/battle/src/View/SubMenu/Status/TileInfo.elm index d08f937..920b5ce 100644 --- a/src/battle/src/View/SubMenu/Status/TileInfo.elm +++ b/src/battle/src/View/SubMenu/Status/TileInfo.elm @@ -27,6 +27,7 @@ get_icon tile =     (Html.div        [           (Html.Attributes.class "battle-tile-card-icon"), +         (Html.Attributes.class "battle-info-card-picture"),           (Html.Attributes.class              (                 "battle-tile-variant-" @@ -48,6 +49,8 @@ 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")              ]              [ @@ -68,6 +71,7 @@ get_cost tile =     in        (Html.div           [ +            (Html.Attributes.class "battle-info-card-text-field"),              (Html.Attributes.class "battle-tile-card-cost")           ]           [ @@ -82,6 +86,7 @@ get_location tile =     in        (Html.div           [ +            (Html.Attributes.class "battle-info-card-text-field"),              (Html.Attributes.class "battle-tile-card-location")           ]           [ @@ -110,12 +115,14 @@ get_html model loc =        (Just tile) ->           (Html.div              [ +               (Html.Attributes.class "battle-info-card"),                 (Html.Attributes.class "battle-tile-card")              ]              [                 (get_name model tile),                 (Html.div                    [ +                     (Html.Attributes.class "battle-info-card-top"),                       (Html.Attributes.class "battle-tile-card-top")                    ]                    [ diff --git a/src/battle/www/index.html b/src/battle/www/index.html index 16c2e21..942de3b 100644 --- a/src/battle/www/index.html +++ b/src/battle/www/index.html @@ -1,8 +1,8 @@  <!DOCTYPE html>  <html>     <head> -      <link rel="stylesheet" type="text/css" href="../global/style.css"> -      <link rel="stylesheet" type="text/css" href="../battle/style.css"> +      <link rel="stylesheet" type="text/css" href="../css/global.css"> +      <link rel="stylesheet" type="text/css" href="../css/battle.css">        <link rel="stylesheet" type="text/css" href="../asset/characters.css">        <link rel="stylesheet" type="text/css" href="../asset/armors.css">        <link rel="icon" type="image/x-icon" href="/favicon.ico"> | 


