Fixes CSS.

28 files changed, 153 insertions, 84 deletions

diff --git a/src/css/src/roster-editor.scss b/src/css/src/roster-editor.scss
new file mode 100644
index 0000000..beb3bb2
--- /dev/null
+++ b/src/css/src/roster-editor.scss
@@ -0,0 +1,4 @@
+@import 'shared/battleview';
+
+@import 'roster-editor/controlled-panel';
+@import 'roster-editor/selection-window';
diff --git a/src/css/src/roster-editor/constants.scss b/src/css/src/roster-editor/constants.scss
new file mode 100644
index 0000000..ee4e862
--- /dev/null
+++ b/src/css/src/roster-editor/constants.scss
@@ -0,0 +1,5 @@
+@import '../shared/battleview/constants';
+
+$CONTROLLED-MENU-WIDTH: 15em;
+
+$NEXT-TO-CONTROLLED-MENU: $CONTROLLED-MENU-WIDTH + $MENU-EXTRA;
diff --git a/src/css/src/roster-editor/controlled-panel.scss b/src/css/src/roster-editor/controlled-panel.scss
new file mode 100644
index 0000000..23b2a8a
--- /dev/null
+++ b/src/css/src/roster-editor/controlled-panel.scss
@@ -0,0 +1,23 @@
+@import '../shared/battleview/constants';
+@import '../shared/battleview/menu-mixins';
+
+@import 'constants';
+
+.controlled
+{
+   @include menu-panel();
+
+   right: 0;
+   top: $BELOW-MAIN-MENU;
+   bottom: $ABOVE-MESSAGE-BOARD;
+
+   width: $CONTROLLED-MENU-WIDTH;
+
+   border-top-right-radius: 0;
+   border-bottom-right-radius: 0;
+   border-right: none;
+
+   display: flex;
+   flex-flow: column;
+   justify-content: space-between;
+}
diff --git a/src/css/src/roster-editor/selection-window.scss b/src/css/src/roster-editor/selection-window.scss
new file mode 100644
index 0000000..57568e3
--- /dev/null
+++ b/src/css/src/roster-editor/selection-window.scss
@@ -0,0 +1,22 @@
+@import '../shared/battleview/constants';
+@import '../shared/battleview/menu-mixins';
+
+@import 'constants';
+
+.selection-window
+{
+   @include menu-panel();
+
+   left: 0;
+   top: $BELOW-MAIN-MENU;
+   bottom: $ABOVE-MESSAGE-BOARD;
+   right: $NEXT-TO-CONTROLLED-MENU;
+
+   border-top-left-radius: 0;
+   border-bottom-left-radius: 0;
+   border-left: none;
+
+   display: flex;
+   flex-flow: column;
+   justify-content: space-between;
+}
diff --git a/src/roster-editor/src/View/ArmorSelection.elm b/src/roster-editor/src/View/ArmorSelection.elm
index 66e005b..db5ebb7 100644
--- a/src/roster-editor/src/View/ArmorSelection.elm
+++ b/src/roster-editor/src/View/ArmorSelection.elm
@@ -18,7 +18,10 @@ import Struct.Model
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
-      [(Html.Attributes.class "roster-editor-armor-selection")]
+      [
+         (Html.Attributes.class "selection-window"),
+         (Html.Attributes.class "armor-selection")
+      ]
       [
          (Html.text "Armor Selection")
       ]
diff --git a/src/roster-editor/src/View/Character.elm b/src/roster-editor/src/View/Character.elm
index 8148565..aabc1ed 100644
--- a/src/roster-editor/src/View/Character.elm
+++ b/src/roster-editor/src/View/Character.elm
@@ -23,7 +23,7 @@ get_icon_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-body"),
+         (Html.Attributes.class "character-icon-body"),
          (Html.Attributes.class "asset-character-team-body-0")
       ]
       [
@@ -34,7 +34,7 @@ get_icon_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_head_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-head"),
+         (Html.Attributes.class "character-icon-head"),
          (Html.Attributes.class
             ("asset-character-icon-" ++ (Struct.Character.get_portrait_id char))
          )
@@ -47,7 +47,7 @@ get_portrait_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-portrait-body"),
+         (Html.Attributes.class "character-portrait-body"),
          (Html.Attributes.class
             (
                "asset-character-portrait-"
@@ -63,7 +63,7 @@ get_portrait_armor_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_armor_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-portrait-armor"),
+         (Html.Attributes.class "character-portrait-armor"),
          (Html.Attributes.class
             (
                "asset-armor-"
@@ -89,8 +89,8 @@ get_portrait_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-portrait"),
-         (Html.Attributes.class "battle-character-portrait-team-0")
+         (Html.Attributes.class "character-portrait"),
+         (Html.Attributes.class "character-portrait-team-0")
       ]
       [
          (get_portrait_body_html char),
@@ -102,8 +102,8 @@ get_icon_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-tiled"),
-         (Html.Attributes.class "battle-character-icon"),
+         (Html.Attributes.class "tiled"),
+         (Html.Attributes.class "character-icon"),
          (Html.Attributes.class "clickable")
       ]
       [
diff --git a/src/roster-editor/src/View/CharacterIcon.elm b/src/roster-editor/src/View/CharacterIcon.elm
index aaf7cb2..4470b4a 100644
--- a/src/roster-editor/src/View/CharacterIcon.elm
+++ b/src/roster-editor/src/View/CharacterIcon.elm
@@ -36,7 +36,7 @@ get_animation_class model char =
                then
                   (Html.Attributes.class "")
                else
-                  (Html.Attributes.class "battle-character-selected")
+                  (Html.Attributes.class "character-selected")
 
             (Struct.TurnResultAnimator.TurnResult current_action) ->
                if
@@ -51,7 +51,7 @@ get_animation_class model char =
                   case current_action of
                      (Struct.TurnResult.Moved _) ->
                         (Html.Attributes.class
-                           "battle-animated-character-icon"
+                           "animated-character-icon"
                         )
 
                      _ -> (Html.Attributes.class "")
@@ -64,9 +64,9 @@ get_activation_level_class : (
 get_activation_level_class char =
    if (Struct.Character.is_enabled char)
    then
-      (Html.Attributes.class "battle-character-icon-enabled")
+      (Html.Attributes.class "character-icon-enabled")
    else
-      (Html.Attributes.class "battle-character-icon-disabled")
+      (Html.Attributes.class "character-icon-disabled")
 
 get_alliance_class : (
       Struct.Model.Type ->
@@ -76,9 +76,9 @@ get_alliance_class : (
 get_alliance_class model char =
    if ((Struct.Character.get_player_ix char) == model.player_ix)
    then
-      (Html.Attributes.class "battle-character-ally")
+      (Html.Attributes.class "character-ally")
    else
-      (Html.Attributes.class "battle-character-enemy")
+      (Html.Attributes.class "character-enemy")
 
 get_position_style : (
       Struct.Character.Type ->
@@ -106,7 +106,7 @@ get_focus_class model char =
       (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char)))
    )
    then
-      (Html.Attributes.class "battle-character-selected")
+      (Html.Attributes.class "character-selected")
    else
       if
       (
@@ -115,7 +115,7 @@ get_focus_class model char =
          (Just (Struct.Character.get_index char))
       )
       then
-         (Html.Attributes.class "battle-character-targeted")
+         (Html.Attributes.class "character-targeted")
       else
          (Html.Attributes.class "")
 
@@ -123,7 +123,7 @@ get_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-body"),
+         (Html.Attributes.class "character-icon-body"),
          (Html.Attributes.class
             (
                "asset-character-team-body-"
@@ -139,7 +139,7 @@ get_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_head_html char =
    (Html.div
       [
-         (Html.Attributes.class "battle-character-icon-head"),
+         (Html.Attributes.class "character-icon-head"),
          (Html.Attributes.class
             ("asset-character-icon-" ++ (Struct.Character.get_icon_id char))
          )
@@ -154,7 +154,7 @@ get_banner_html char =
       Struct.Character.Commander ->
          (Html.div
             [
-               (Html.Attributes.class "battle-character-icon-banner"),
+               (Html.Attributes.class "character-icon-banner"),
                (Html.Attributes.class "asset-character-icon-commander-banner")
             ]
             [
@@ -164,7 +164,7 @@ get_banner_html char =
       Struct.Character.Target ->
          (Html.div
             [
-               (Html.Attributes.class "battle-character-icon-banner"),
+               (Html.Attributes.class "character-icon-banner"),
                (Html.Attributes.class "asset-character-icon-target-banner")
             ]
             [
@@ -181,8 +181,8 @@ get_actual_html : (
 get_actual_html model char =
       (Html.div
          [
-            (Html.Attributes.class "battle-tiled"),
-            (Html.Attributes.class "battle-character-icon"),
+            (Html.Attributes.class "tiled"),
+            (Html.Attributes.class "character-icon"),
             (get_animation_class model char),
             (get_activation_level_class char),
             (get_alliance_class model char),
diff --git a/src/roster-editor/src/View/CharacterSelection.elm b/src/roster-editor/src/View/CharacterSelection.elm
index 063443b..fa26668 100644
--- a/src/roster-editor/src/View/CharacterSelection.elm
+++ b/src/roster-editor/src/View/CharacterSelection.elm
@@ -18,7 +18,10 @@ import Struct.Model
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
-      [(Html.Attributes.class "roster-editor-character-selection")]
+      [
+         (Html.Attributes.class "selection-window"),
+         (Html.Attributes.class "character-selection")
+      ]
       [
          (Html.text "Character Selection")
       ]
diff --git a/src/roster-editor/src/View/Gauge.elm b/src/roster-editor/src/View/Gauge.elm
index cf89f3a..2b9c4e0 100644
--- a/src/roster-editor/src/View/Gauge.elm
+++ b/src/roster-editor/src/View/Gauge.elm
@@ -18,7 +18,7 @@ get_text_div: (
 get_text_div text extra_txt_attr =
    (Html.div
       (
-         [(Html.Attributes.class "battle-gauge-text")]
+         [(Html.Attributes.class "gauge-text")]
          ++ extra_txt_attr
       )
       [
@@ -41,7 +41,7 @@ get_bar_div percent extra_bar_attr =
                ]
             ),
             (Html.Attributes.class
-               "battle-gauge-bar"
+               "gauge-bar"
             )
          ]
          ++
@@ -66,7 +66,7 @@ get_html : (
 get_html text percent extra_div_attr extra_bar_attr extra_txt_attr =
    (Html.div
       (
-         [(Html.Attributes.class "battle-gauge")]
+         [(Html.Attributes.class "gauge")]
          ++ extra_div_attr
       )
       [
diff --git a/src/roster-editor/src/View/GlyphManagement.elm b/src/roster-editor/src/View/GlyphManagement.elm
index 51dc151..2bf41f2 100644
--- a/src/roster-editor/src/View/GlyphManagement.elm
+++ b/src/roster-editor/src/View/GlyphManagement.elm
@@ -18,7 +18,10 @@ import Struct.Model
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
-      [(Html.Attributes.class "roster-editor-glyph-management")]
+      [
+         (Html.Attributes.class "selection-window"),
+         (Html.Attributes.class "roster-editor-glyph-management")
+      ]
       [
          (Html.text "Glyph Management")
       ]
diff --git a/src/roster-editor/src/View/MainMenu.elm b/src/roster-editor/src/View/MainMenu.elm
index 2a5b7bb..5dfa706 100644
--- a/src/roster-editor/src/View/MainMenu.elm
+++ b/src/roster-editor/src/View/MainMenu.elm
@@ -47,7 +47,7 @@ get_html : (Html.Html Struct.Event.Type)
 get_html =
    (Html.div
       [
-         (Html.Attributes.class "battle-main-menu")
+         (Html.Attributes.class "main-menu")
       ]
       [
          (get_main_menu_button_html),
diff --git a/src/roster-editor/src/View/MessageBoard/Error.elm b/src/roster-editor/src/View/MessageBoard/Error.elm
index 797d89f..c03467a 100644
--- a/src/roster-editor/src/View/MessageBoard/Error.elm
+++ b/src/roster-editor/src/View/MessageBoard/Error.elm
@@ -24,8 +24,8 @@ get_html : (
 get_html model error =
    (Html.div
       [
-         (Html.Attributes.class "battle-message-board"),
-         (Html.Attributes.class "battle-error")
+         (Html.Attributes.class "message-board"),
+         (Html.Attributes.class "error")
       ]
       [
          (Html.text (Struct.Error.to_string error))
diff --git a/src/roster-editor/src/View/MessageBoard/Help.elm b/src/roster-editor/src/View/MessageBoard/Help.elm
index daefba5..ff68688 100644
--- a/src/roster-editor/src/View/MessageBoard/Help.elm
+++ b/src/roster-editor/src/View/MessageBoard/Help.elm
@@ -22,8 +22,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-message-board"),
-         (Html.Attributes.class "battle-message-board-help")
+         (Html.Attributes.class "message-board"),
+         (Html.Attributes.class "message-board-help")
       ]
       (
          case model.help_request of
diff --git a/src/roster-editor/src/View/MessageBoard/Help/Guide.elm b/src/roster-editor/src/View/MessageBoard/Help/Guide.elm
index 0c1df7e..0cf8419 100644
--- a/src/roster-editor/src/View/MessageBoard/Help/Guide.elm
+++ b/src/roster-editor/src/View/MessageBoard/Help/Guide.elm
@@ -17,7 +17,7 @@ get_header_html title =
       []
       [
          (Html.div
-            [(Html.Attributes.class "battle-help-guide-icon")]
+            [(Html.Attributes.class "help-guide-icon")]
             []
          ),
          (Html.text title)
diff --git a/src/roster-editor/src/View/PortraitSelection.elm b/src/roster-editor/src/View/PortraitSelection.elm
index bb8b1ae..804e58c 100644
--- a/src/roster-editor/src/View/PortraitSelection.elm
+++ b/src/roster-editor/src/View/PortraitSelection.elm
@@ -18,7 +18,10 @@ import Struct.Model
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
-      [(Html.Attributes.class "roster-editor-portrait-selection")]
+      [
+         (Html.Attributes.class "selection-window"),
+         (Html.Attributes.class "roster-editor-portrait-selection")
+      ]
       [
          (Html.text "Portrait Selection")
       ]
diff --git a/src/roster-editor/src/View/SubMenu/Characters.elm b/src/roster-editor/src/View/SubMenu/Characters.elm
index 396dbee..e433ab0 100644
--- a/src/roster-editor/src/View/SubMenu/Characters.elm
+++ b/src/roster-editor/src/View/SubMenu/Characters.elm
@@ -24,7 +24,7 @@ get_character_element_html : (
 get_character_element_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battle-characters-element"),
+         (Html.Attributes.class "characters-element"),
          (
             if (Struct.Character.is_alive char)
             then
@@ -38,9 +38,9 @@ get_character_element_html player_ix char =
          (
             if (Struct.Character.is_enabled char)
             then
-               (Html.Attributes.class "battle-characters-element-active")
+               (Html.Attributes.class "characters-element-active")
             else
-               (Html.Attributes.class "battle-characters-element-inactive")
+               (Html.Attributes.class "characters-element-inactive")
          )
       ]
       [
@@ -59,8 +59,8 @@ get_html : (
 get_html characters player_ix =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-content"),
-         (Html.Attributes.class "battle-tabmenu-characters-tab")
+         (Html.Attributes.class "tabmenu-content"),
+         (Html.Attributes.class "tabmenu-characters-tab")
       ]
       (List.map
          (get_character_element_html player_ix)
diff --git a/src/roster-editor/src/View/SubMenu/Settings.elm b/src/roster-editor/src/View/SubMenu/Settings.elm
index e0ad4d7..0becac1 100644
--- a/src/roster-editor/src/View/SubMenu/Settings.elm
+++ b/src/roster-editor/src/View/SubMenu/Settings.elm
@@ -30,8 +30,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-content"),
-         (Html.Attributes.class "battle-tabmenu-settings-tab")
+         (Html.Attributes.class "tabmenu-content"),
+         (Html.Attributes.class "tabmenu-settings-tab")
       ]
       [
          (scale_button (0.75) "Zoom -"),
diff --git a/src/roster-editor/src/View/SubMenu/Status.elm b/src/roster-editor/src/View/SubMenu/Status.elm
index 485704e..afb9f09 100644
--- a/src/roster-editor/src/View/SubMenu/Status.elm
+++ b/src/roster-editor/src/View/SubMenu/Status.elm
@@ -26,8 +26,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battle-footer-tabmenu-content"),
-         (Html.Attributes.class "battle-footer-tabmenu-content-status")
+         (Html.Attributes.class "footer-tabmenu-content"),
+         (Html.Attributes.class "footer-tabmenu-content-status")
       ]
       [
          (case (Struct.UI.get_previous_action model.ui) of
diff --git a/src/roster-editor/src/View/SubMenu/Status/CharacterInfo.elm b/src/roster-editor/src/View/SubMenu/Status/CharacterInfo.elm
index 814ce5f..094b8d0 100644
--- a/src/roster-editor/src/View/SubMenu/Status/CharacterInfo.elm
+++ b/src/roster-editor/src/View/SubMenu/Status/CharacterInfo.elm
@@ -25,7 +25,7 @@ get_html : (
 get_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-character-info")
+         (Html.Attributes.class "tabmenu-character-info")
       ]
       [
          (Html.text ("Focusing:")),
diff --git a/src/roster-editor/src/View/SubMenu/Status/TileInfo.elm b/src/roster-editor/src/View/SubMenu/Status/TileInfo.elm
index cace444..1dbe8f6 100644
--- a/src/roster-editor/src/View/SubMenu/Status/TileInfo.elm
+++ b/src/roster-editor/src/View/SubMenu/Status/TileInfo.elm
@@ -27,11 +27,11 @@ get_icon : (Struct.Tile.Instance -> (Html.Html Struct.Event.Type))
 get_icon tile =
    (Html.div
       [
-         (Html.Attributes.class "battle-tile-card-icon"),
-         (Html.Attributes.class "battle-info-card-picture"),
+         (Html.Attributes.class "tile-card-icon"),
+         (Html.Attributes.class "info-card-picture"),
          (Html.Attributes.class
             (
-               "battle-tile-variant-"
+               "tile-variant-"
                ++ (toString (Struct.Tile.get_local_variant_ix tile))
             )
          )
@@ -50,9 +50,9 @@ 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")
+               (Html.Attributes.class "info-card-name"),
+               (Html.Attributes.class "info-card-text-field"),
+               (Html.Attributes.class "tile-card-name")
             ]
             [
                (Html.text (Struct.Tile.get_name tile_type))
@@ -72,8 +72,8 @@ get_cost tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-text-field"),
-            (Html.Attributes.class "battle-tile-card-cost")
+            (Html.Attributes.class "info-card-text-field"),
+            (Html.Attributes.class "tile-card-cost")
          ]
          [
             (Html.text text)
@@ -87,8 +87,8 @@ get_location tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-text-field"),
-            (Html.Attributes.class "battle-tile-card-location")
+            (Html.Attributes.class "info-card-text-field"),
+            (Html.Attributes.class "tile-card-location")
          ]
          [
             (Html.text
@@ -110,7 +110,7 @@ get_mod_html mod =
    in
       (Html.div
          [
-            (Html.Attributes.class "battle-info-card-mod")
+            (Html.Attributes.class "info-card-mod")
          ]
          [
             (Html.text
@@ -123,7 +123,7 @@ get_omnimods_listing : (List (String, Int)) -> (Html.Html Struct.Event.Type)
 get_omnimods_listing mod_list =
    (Html.div
       [
-         (Html.Attributes.class "battle-info-card-omnimods-listing")
+         (Html.Attributes.class "info-card-omnimods-listing")
       ]
       (List.map (get_mod_html) mod_list)
    )
@@ -132,7 +132,7 @@ get_omnimods : Struct.Omnimods.Type -> (Html.Html Struct.Event.Type)
 get_omnimods omnimods =
    (Html.div
       [
-         (Html.Attributes.class "battle-info-card-omnimods")
+         (Html.Attributes.class "info-card-omnimods")
       ]
       [
          (Html.text "Attribute Modifiers"),
@@ -158,15 +158,15 @@ get_html model loc =
       (Just tile) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-info-card"),
-               (Html.Attributes.class "battle-tile-card")
+               (Html.Attributes.class "info-card"),
+               (Html.Attributes.class "tile-card")
             ]
             [
                (get_name model tile),
                (Html.div
                   [
-                     (Html.Attributes.class "battle-info-card-top"),
-                     (Html.Attributes.class "battle-tile-card-top")
+                     (Html.Attributes.class "info-card-top"),
+                     (Html.Attributes.class "tile-card-top")
                   ]
                   [
                      (get_icon tile),
diff --git a/src/roster-editor/src/View/SubMenu/Timeline.elm b/src/roster-editor/src/View/SubMenu/Timeline.elm
index 7fb1813..a0978b5 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline.elm
@@ -71,8 +71,8 @@ true_get_html : (
 true_get_html characters player_ix turn_results =
    (Html.div
       [
-         (Html.Attributes.class "battle-tabmenu-content"),
-         (Html.Attributes.class "battle-tabmenu-timeline-tab")
+         (Html.Attributes.class "tabmenu-content"),
+         (Html.Attributes.class "tabmenu-timeline-tab")
       ]
       (Array.toList
          (Array.map
diff --git a/src/roster-editor/src/View/SubMenu/Timeline/Attack.elm b/src/roster-editor/src/View/SubMenu/Timeline/Attack.elm
index 682540d..6ba8cd0 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline/Attack.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline/Attack.elm
@@ -26,7 +26,7 @@ get_title_html : (
 get_title_html attacker defender =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-attack-title")
+         (Html.Attributes.class "timeline-attack-title")
       ]
       [
          (Html.text
@@ -135,8 +135,8 @@ get_html characters player_ix attack =
       ((Just atkchar), (Just defchar)) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-attack")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-attack")
             ]
             (
                [
@@ -155,8 +155,8 @@ get_html characters player_ix attack =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-attack")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-attack")
             ]
             [
                (Html.text "Error: Attack with unknown characters")
diff --git a/src/roster-editor/src/View/SubMenu/Timeline/Movement.elm b/src/roster-editor/src/View/SubMenu/Timeline/Movement.elm
index 0746f1f..e3be53d 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline/Movement.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline/Movement.elm
@@ -32,8 +32,8 @@ get_html characters player_ix movement =
       (Just char) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-movement")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-movement")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -53,8 +53,8 @@ get_html characters player_ix movement =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-movement")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-movement")
             ]
             [
                (Html.text "Error: Moving with unknown character")
diff --git a/src/roster-editor/src/View/SubMenu/Timeline/PlayerDefeat.elm b/src/roster-editor/src/View/SubMenu/Timeline/PlayerDefeat.elm
index db5e023..1d91c9a 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline/PlayerDefeat.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline/PlayerDefeat.elm
@@ -23,8 +23,8 @@ get_html : (
 get_html pdefeat =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-element"),
-         (Html.Attributes.class "battle-timeline-player-defeat")
+         (Html.Attributes.class "timeline-element"),
+         (Html.Attributes.class "timeline-player-defeat")
       ]
       [
          (Html.text
diff --git a/src/roster-editor/src/View/SubMenu/Timeline/PlayerTurnStart.elm b/src/roster-editor/src/View/SubMenu/Timeline/PlayerTurnStart.elm
index a6486fa..233e03c 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline/PlayerTurnStart.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline/PlayerTurnStart.elm
@@ -23,8 +23,8 @@ get_html : (
 get_html pturns =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-element"),
-         (Html.Attributes.class "battle-timeline-turn-start")
+         (Html.Attributes.class "timeline-element"),
+         (Html.Attributes.class "timeline-turn-start")
       ]
       [
          (Html.text
diff --git a/src/roster-editor/src/View/SubMenu/Timeline/PlayerVictory.elm b/src/roster-editor/src/View/SubMenu/Timeline/PlayerVictory.elm
index 4d47f62..9728f04 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline/PlayerVictory.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline/PlayerVictory.elm
@@ -23,8 +23,8 @@ get_html : (
 get_html pvict =
    (Html.div
       [
-         (Html.Attributes.class "battle-timeline-element"),
-         (Html.Attributes.class "battle-timeline-player-victory")
+         (Html.Attributes.class "timeline-element"),
+         (Html.Attributes.class "timeline-player-victory")
       ]
       [
          (Html.text
diff --git a/src/roster-editor/src/View/SubMenu/Timeline/WeaponSwitch.elm b/src/roster-editor/src/View/SubMenu/Timeline/WeaponSwitch.elm
index 499e0c3..2e874b0 100644
--- a/src/roster-editor/src/View/SubMenu/Timeline/WeaponSwitch.elm
+++ b/src/roster-editor/src/View/SubMenu/Timeline/WeaponSwitch.elm
@@ -32,8 +32,8 @@ get_html characters player_ix weapon_switch =
       (Just char) ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-weapon-switch")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-weapon-switch")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -49,8 +49,8 @@ get_html characters player_ix weapon_switch =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battle-timeline-element"),
-               (Html.Attributes.class "battle-timeline-weapon-switch")
+               (Html.Attributes.class "timeline-element"),
+               (Html.Attributes.class "timeline-weapon-switch")
             ]
             [
                (Html.text "Error: Unknown character switched weapons")
diff --git a/src/roster-editor/src/View/WeaponSelection.elm b/src/roster-editor/src/View/WeaponSelection.elm
index 51837bb..0d15b77 100644
--- a/src/roster-editor/src/View/WeaponSelection.elm
+++ b/src/roster-editor/src/View/WeaponSelection.elm
@@ -18,7 +18,10 @@ import Struct.Model
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
-      [(Html.Attributes.class "roster-editor-weapon-selection")]
+      [
+         (Html.Attributes.class "selection-window"),
+         (Html.Attributes.class "roster-editor-weapon-selection")
+      ]
       [
          (Html.text "Weapon Selection")
       ]