| summaryrefslogtreecommitdiff | 
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2019-04-29 18:11:15 +0200 | 
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2019-04-29 18:11:15 +0200 | 
| commit | 6b6e1a9d6e1ed475d108a75a618d4a60544482e5 (patch) | |
| tree | cd3a975483ec9748c1379a7488568c98c62be529 /src | |
| parent | 6ca8f6fbb8083db156c906e848173e827de838ef (diff) | |
Still a lot of work to be done with the CSS...
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/src/View/Controlled/CharacterCard.elm | 4 | ||||
| -rw-r--r-- | src/css/src/shared/battle-characters/info-card.scss | 18 | ||||
| -rw-r--r-- | src/css/src/shared/omnimod-icons.scss | 13 | ||||
| -rw-r--r-- | src/roster-editor/src/View/CharacterCard.elm | 10 | 
4 files changed, 32 insertions, 13 deletions
| diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm index e64b7f8..19155f3 100644 --- a/src/battle/src/View/Controlled/CharacterCard.elm +++ b/src/battle/src/View/Controlled/CharacterCard.elm @@ -431,7 +431,7 @@ get_summary_html char_turn player_ix char =                 (BattleCharacters.Struct.Equipment.get_armor equipment)              ),              (Html.div -               [] +               [(Html.Attributes.class "character-card-stats")]                 (Battle.View.Statistic.get_all_but_gauges_html                    char_statistics                 ) @@ -500,7 +500,7 @@ get_full_html player_ix char =                 (BattleCharacters.Struct.Equipment.get_armor equipment)              ),              (Html.div -               [] +               [(Html.Attributes.class "character-card-stats")]                 (Battle.View.Statistic.get_all_but_gauges_html                    char_statistics                 ) diff --git a/src/css/src/shared/battle-characters/info-card.scss b/src/css/src/shared/battle-characters/info-card.scss index 7a90a97..d36e204 100644 --- a/src/css/src/shared/battle-characters/info-card.scss +++ b/src/css/src/shared/battle-characters/info-card.scss @@ -122,12 +122,6 @@     flex-wrap: wrap;  } -.character-card-stats > *, -.character-card-armor-stats > * -{ -   width: 25%; -} -  .character-card-stats  {     display: flex; @@ -156,3 +150,15 @@  {     display: inline-block;  } + +.character-card-stats, +.character-card-atts, +.character-card-stats > *, +.character-card-atts > * + +{ +   display: flex; +   flex-direction: row; +   flex-wrap: wrap; +} + diff --git a/src/css/src/shared/omnimod-icons.scss b/src/css/src/shared/omnimod-icons.scss index 99ad7fe..fa86703 100644 --- a/src/css/src/shared/omnimod-icons.scss +++ b/src/css/src/shared/omnimod-icons.scss @@ -134,3 +134,16 @@  {     filter: hue-rotate(30deg);  } + +.omnimod-attack-mods, +.omnimod-defense-mods, +.omnimod-attribute-mods, +.omnimod-statistics-mods, +.omnimod-attack-mods > *, +.omnimod-defense-mods > *, +.omnimod-attribute-mods > *, +.omnimod-statistics-mods >* +{ +   display: flex; +   flex-wrap: wrap; +} diff --git a/src/roster-editor/src/View/CharacterCard.elm b/src/roster-editor/src/View/CharacterCard.elm index 5b1187f..7febc9f 100644 --- a/src/roster-editor/src/View/CharacterCard.elm +++ b/src/roster-editor/src/View/CharacterCard.elm @@ -17,6 +17,8 @@ import Battle.Struct.Omnimods  import Battle.Struct.Statistics  import Battle.View.Omnimods +import Battle.View.Statistic +import Battle.View.Attribute  -- Battle Characters -----------------------------------------------------------  import BattleCharacters.Struct.Armor @@ -348,8 +350,7 @@ get_relevant_stats stats =              (Struct.Event.TabSelected Struct.UI.GlyphManagementTab)           )        ] -      [ -      ] +      (Battle.View.Statistic.get_all_but_gauges_html stats)     )  get_attributes : ( @@ -359,14 +360,13 @@ get_attributes : (  get_attributes atts =     (Html.div        [ -         (Html.Attributes.class "character-card-stats"), +         (Html.Attributes.class "character-card-atts"),           (Html.Attributes.class "clickable"),           (Html.Events.onClick              (Struct.Event.TabSelected Struct.UI.GlyphManagementTab)           )        ] -      [ -      ] +      (Battle.View.Attribute.get_all_html atts)     ) | 


