Experimenting with icons

2 files changed, 53 insertions, 105 deletions

diff --git a/src/shared/battle/Battle/View/Attribute.elm b/src/shared/battle/Battle/View/Attribute.elm
index 9b2a8c7..5c53b4c 100644
--- a/src/shared/battle/Battle/View/Attribute.elm
+++ b/src/shared/battle/Battle/View/Attribute.elm
@@ -41,6 +41,13 @@ get_html attribute value =
                (Struct.HelpRequest.Attribute attribute)
             )
          ),
+         (Html.Attributes.class "omnimod-icon"),
+         (Html.Attributes.class
+            (
+               "omnimod-icon-"
+               ++ (Battle.Struct.Attributes.encode_category attribute)
+            )
+         ),
          (Html.Attributes.class
             (
                if (value < 0)
@@ -53,32 +60,12 @@ get_html attribute value =
          )
       ]
       [
-         (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")
-            ]
-            [
-               (Html.text
-                  (
-                     if (Battle.Struct.Attributes.is_percent attribute)
-                     then ((String.fromInt value) ++ "%")
-                     else (String.fromInt value)
-                  )
-               )
-            ]
+         (Html.text
+            (
+               if (Battle.Struct.Attributes.is_percent attribute)
+               then ((String.fromInt value) ++ "%")
+               else (String.fromInt value)
+            )
          )
       ]
    )
@@ -96,6 +83,13 @@ get_signed_html attribute value =
             then (Html.Attributes.class "omnimod-negative")
             else (Html.Attributes.class "omnimod-positive")
          ),
+         (Html.Attributes.class "omnimod-icon"),
+         (Html.Attributes.class
+            (
+               "omnimod-icon-"
+               ++ (Battle.Struct.Attributes.encode_category attribute)
+            )
+         ),
          (Html.Events.onClick
             (Struct.Event.RequestedHelp
                (Struct.HelpRequest.Attribute attribute)
@@ -103,40 +97,20 @@ get_signed_html attribute value =
          )
       ]
       [
-         (Html.div
-            [
-               (Html.Attributes.class "omnimod-icon"),
-               (Html.Attributes.class
-                  (
-                     "omnimod-icon-"
-                     ++ (Battle.Struct.Attributes.encode_category attribute)
-                  )
+         (Html.text
+            (
+               (
+                  if (value > 0)
+                  then ("+" ++ (String.fromInt value))
+                  else (String.fromInt value)
                )
-            ]
-            [
-            ]
-         ),
-         (Html.div
-            [
-               (Html.Attributes.class "omnimod-value")
-            ]
-            [
-               (Html.text
-                  (
-                     (
-                        if (value > 0)
-                        then ("+" ++ (String.fromInt value))
-                        else (String.fromInt value)
-                     )
-                     ++
-                     (
-                        if (Battle.Struct.Attributes.is_percent attribute)
-                        then "%"
-                        else ""
-                     )
-                  )
+               ++
+               (
+                  if (Battle.Struct.Attributes.is_percent attribute)
+                  then "%"
+                  else ""
                )
-            ]
+            )
          )
       ]
    )
diff --git a/src/shared/battle/Battle/View/DamageType.elm b/src/shared/battle/Battle/View/DamageType.elm
index eee2838..4f74133 100644
--- a/src/shared/battle/Battle/View/DamageType.elm
+++ b/src/shared/battle/Battle/View/DamageType.elm
@@ -33,6 +33,13 @@ get_html : (
 get_html damage_type value =
    (Html.div
       [
+         (Html.Attributes.class "omnimod-icon"),
+         (Html.Attributes.class
+            (
+               "omnimod-icon-"
+               ++ (Battle.Struct.DamageType.encode damage_type)
+            )
+         ),
          (Html.Events.onClick
             (Struct.Event.RequestedHelp
                (Struct.HelpRequest.DamageType damage_type)
@@ -40,27 +47,7 @@ get_html damage_type value =
          )
       ]
       [
-         (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")
-            ]
-            [
-               (Html.text (String.fromInt value))
-            ]
-         )
+         (Html.text (String.fromInt value))
       ]
    )
 
@@ -77,6 +64,13 @@ get_signed_html damage_type value =
             then (Html.Attributes.class "omnimod-negative")
             else (Html.Attributes.class "omnimod-positive")
          ),
+         (Html.Attributes.class "omnimod-icon"),
+         (Html.Attributes.class
+            (
+               "omnimod-icon-"
+               ++ (Battle.Struct.DamageType.encode damage_type)
+            )
+         ),
          (Html.Events.onClick
             (Struct.Event.RequestedHelp
                (Struct.HelpRequest.DamageType damage_type)
@@ -84,32 +78,12 @@ get_signed_html damage_type value =
          )
       ]
       [
-         (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")
-            ]
-            [
-               (Html.text
-                  (
-                     if (value > 0)
-                     then ("+" ++ (String.fromInt value))
-                     else (String.fromInt value)
-                  )
-               )
-            ]
+         (Html.text
+            (
+               if (value > 0)
+               then ("+" ++ (String.fromInt value))
+               else (String.fromInt value)
+            )
          )
       ]
    )