From b0eca141eb88866b09df80c199d8731b6d97ac8b Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 13 Sep 2019 14:28:50 +0200 Subject: More successful attempt at improving omnimods UI. --- src/shared/battle/Battle/View/Attribute.elm | 40 ++++++++++------------------ src/shared/battle/Battle/View/DamageType.elm | 40 ++++++++++------------------ src/shared/battle/Battle/View/Omnimods.elm | 4 +-- 3 files changed, 30 insertions(+), 54 deletions(-) (limited to 'src/shared/battle/Battle') diff --git a/src/shared/battle/Battle/View/Attribute.elm b/src/shared/battle/Battle/View/Attribute.elm index 9b2a8c7..80e75f1 100644 --- a/src/shared/battle/Battle/View/Attribute.elm +++ b/src/shared/battle/Battle/View/Attribute.elm @@ -50,22 +50,16 @@ get_html attribute value = then "omnimod-positive-value" else "omnimod-nil-value" ) + ), + (Html.Attributes.class "omnimod-icon"), + (Html.Attributes.class + ( + "omnimod-icon-" + ++ (Battle.Struct.Attributes.encode_category attribute) + ) ) ] [ - (Html.div - [ - (Html.Attributes.class "omnimod-icon"), - (Html.Attributes.class - ( - "omnimod-icon-" - ++ (Battle.Struct.Attributes.encode_category attribute) - ) - ) - ] - [ - ] - ), (Html.div [ (Html.Attributes.class "omnimod-value") @@ -100,22 +94,16 @@ get_signed_html attribute value = (Struct.Event.RequestedHelp (Struct.HelpRequest.Attribute attribute) ) + ), + (Html.Attributes.class "omnimod-icon"), + (Html.Attributes.class + ( + "omnimod-icon-" + ++ (Battle.Struct.Attributes.encode_category attribute) + ) ) ] [ - (Html.div - [ - (Html.Attributes.class "omnimod-icon"), - (Html.Attributes.class - ( - "omnimod-icon-" - ++ (Battle.Struct.Attributes.encode_category attribute) - ) - ) - ] - [ - ] - ), (Html.div [ (Html.Attributes.class "omnimod-value") diff --git a/src/shared/battle/Battle/View/DamageType.elm b/src/shared/battle/Battle/View/DamageType.elm index eee2838..1302407 100644 --- a/src/shared/battle/Battle/View/DamageType.elm +++ b/src/shared/battle/Battle/View/DamageType.elm @@ -37,22 +37,16 @@ get_html damage_type value = (Struct.Event.RequestedHelp (Struct.HelpRequest.DamageType damage_type) ) + ), + (Html.Attributes.class "omnimod-icon"), + (Html.Attributes.class + ( + "omnimod-icon-" + ++ (Battle.Struct.DamageType.encode damage_type) + ) ) ] [ - (Html.div - [ - (Html.Attributes.class "omnimod-icon"), - (Html.Attributes.class - ( - "omnimod-icon-" - ++ (Battle.Struct.DamageType.encode damage_type) - ) - ) - ] - [ - ] - ), (Html.div [ (Html.Attributes.class "omnimod-value") @@ -81,22 +75,16 @@ get_signed_html damage_type value = (Struct.Event.RequestedHelp (Struct.HelpRequest.DamageType damage_type) ) + ), + (Html.Attributes.class "omnimod-icon"), + (Html.Attributes.class + ( + "omnimod-icon-" + ++ (Battle.Struct.DamageType.encode damage_type) + ) ) ] [ - (Html.div - [ - (Html.Attributes.class "omnimod-icon"), - (Html.Attributes.class - ( - "omnimod-icon-" - ++ (Battle.Struct.DamageType.encode damage_type) - ) - ) - ] - [ - ] - ), (Html.div [ (Html.Attributes.class "omnimod-value") diff --git a/src/shared/battle/Battle/View/Omnimods.elm b/src/shared/battle/Battle/View/Omnimods.elm index b914bca..14da8ed 100644 --- a/src/shared/battle/Battle/View/Omnimods.elm +++ b/src/shared/battle/Battle/View/Omnimods.elm @@ -123,7 +123,7 @@ get_html omnimods = ), (Html.div [ - (Html.Attributes.class "omnimod-attributes-mods") + (Html.Attributes.class "omnimod-attribute-mods") ] (List.map (\(k, v) -> @@ -193,7 +193,7 @@ get_user_friendly_html omnimods = ), (Html.div [ - (Html.Attributes.class "omnimod-attributes-mods") + (Html.Attributes.class "omnimod-attribute-mods") ] (List.map (\(k, v) -> -- cgit v1.2.3-70-g09d2