More successful attempt at improving omnimods UI.

3 files changed, 30 insertions, 54 deletions

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,24 +50,18 @@ 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,24 +94,18 @@ 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,24 +37,18 @@ 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,24 +75,18 @@ 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) ->