| summaryrefslogtreecommitdiff | 
diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/src/Struct/UI.elm | 10 | ||||
| -rw-r--r-- | src/battle/src/View/MainMenu.elm | 16 | ||||
| -rw-r--r-- | src/css/src/battle.scss | 1 | ||||
| -rw-r--r-- | src/css/src/battle/controlled-panel/buttons.scss | 1 | ||||
| -rw-r--r-- | src/css/src/shared/battle-view/main-menu.scss | 27 | ||||
| -rw-r--r-- | src/roster-editor/src/Struct/UI.elm | 12 | ||||
| -rw-r--r-- | src/roster-editor/src/View/MainMenu.elm | 5 | 
7 files changed, 59 insertions, 13 deletions
| diff --git a/src/battle/src/Struct/UI.elm b/src/battle/src/Struct/UI.elm index b1cee5c..0c0aeb6 100644 --- a/src/battle/src/Struct/UI.elm +++ b/src/battle/src/Struct/UI.elm @@ -16,6 +16,7 @@ module Struct.UI exposing        set_displayed_tab,        clear_displayed_tab,        tab_to_string, +      tab_to_class_name,        get_all_tabs,        -- Navigator @@ -108,6 +109,15 @@ tab_to_string tab =        SettingsTab -> "Settings"        TimelineTab -> "Timeline" +tab_to_class_name : Tab -> String +tab_to_class_name tab = +   case tab of +      (TileStatusTab _) -> "status" +      (CharacterStatusTab _) -> "status" +      CharactersTab -> "characters" +      SettingsTab -> "parameters" +      TimelineTab -> "timeline" +  get_all_tabs : (List Tab)  get_all_tabs =     [CharactersTab, SettingsTab, TimelineTab] diff --git a/src/battle/src/View/MainMenu.elm b/src/battle/src/View/MainMenu.elm index 318604c..093f4a4 100644 --- a/src/battle/src/View/MainMenu.elm +++ b/src/battle/src/View/MainMenu.elm @@ -15,15 +15,23 @@ import Struct.UI  get_menu_button_html : Struct.UI.Tab -> (Html.Html Struct.Event.Type)  get_menu_button_html tab =     (Html.button -      [ (Html.Events.onClick (Struct.Event.TabSelected tab)) ] -      [ (Html.text (Struct.UI.tab_to_string tab)) ] +      [ +         (Html.Events.onClick (Struct.Event.TabSelected tab)), +         (Html.Attributes.class (Struct.UI.tab_to_class_name tab)) +      ] +      [ +      ]     )  get_main_menu_button_html : (Html.Html Struct.Event.Type)  get_main_menu_button_html =     (Html.button -      [ (Html.Events.onClick Struct.Event.GoToMainMenu) ] -      [ (Html.text "Main Menu") ] +      [ +         (Html.Events.onClick Struct.Event.GoToMainMenu), +         (Html.Attributes.class "main-menu") +      ] +      [ +      ]     )  -------------------------------------------------------------------------------- diff --git a/src/css/src/battle.scss b/src/css/src/battle.scss index c730d8d..06bf5b0 100644 --- a/src/css/src/battle.scss +++ b/src/css/src/battle.scss @@ -4,6 +4,7 @@  @import 'shared/battle-map';  @import 'shared/omnimod-icons'; +@import 'battle/main-menu';  @import 'battle/controlled-panel';  @import 'battle/portrait-effects';  @import 'battle/keyframes'; diff --git a/src/css/src/battle/controlled-panel/buttons.scss b/src/css/src/battle/controlled-panel/buttons.scss index 903642b..31efe30 100644 --- a/src/css/src/battle/controlled-panel/buttons.scss +++ b/src/css/src/battle/controlled-panel/buttons.scss @@ -19,6 +19,7 @@  .action-button.abort-button  { +   background-size: 95%;     background-image: url(/asset/svg/damage_type/abort.svg);  } diff --git a/src/css/src/shared/battle-view/main-menu.scss b/src/css/src/shared/battle-view/main-menu.scss index fd5db10..fcb31e6 100644 --- a/src/css/src/shared/battle-view/main-menu.scss +++ b/src/css/src/shared/battle-view/main-menu.scss @@ -3,7 +3,7 @@  @import 'constants';  @import 'menu-mixins'; -.main-menu +div.main-menu  {     position: absolute;     top: 0; @@ -14,9 +14,6 @@     @include menu-background-color(); -   display: flex; -   flex-direction: row; -   flex-wrap: wrap;     @include menu-border();     border-top: none; @@ -28,10 +25,24 @@     @include menu-margin();     margin-top: 0; +} -   display: flex; -   flex-direction: row; -   flex-wrap: wrap; -   justify-content: space-between; +div.main-menu button +{ +   width: 42px; +   height: 42px; +   background-size: 97%; +   background-repeat: no-repeat; +   background-position: center;  } +div.main-menu button.main-menu +{ +   background-size: 86%; +   background-image: url(/asset/svg/to-favicon.svg); +} + +div.main-menu button.parameters +{ +   background-image: url(/asset/svg/damage_type/parameters.svg); +} diff --git a/src/roster-editor/src/Struct/UI.elm b/src/roster-editor/src/Struct/UI.elm index 33e1181..1bc86bb 100644 --- a/src/roster-editor/src/Struct/UI.elm +++ b/src/roster-editor/src/Struct/UI.elm @@ -7,6 +7,7 @@ module Struct.UI exposing        get_displayed_tab,        set_displayed_tab,        reset_displayed_tab, +      tab_to_class_name,        -- Which glyph slot is being edited?        set_glyph_slot,        get_glyph_slot @@ -55,6 +56,17 @@ set_displayed_tab tab ui = {ui | displayed_tab = tab}  reset_displayed_tab : Type -> Type  reset_displayed_tab ui = {ui | displayed_tab = CharacterSelectionTab} +tab_to_class_name : Tab -> String +tab_to_class_name tab = +   case tab of +   CharacterSelectionTab -> "characters" +   PortraitSelectionTab -> "portraits" +   WeaponSelectionTab -> "weapons" +   ArmorSelectionTab -> "armors" +   GlyphSelectionTab -> "glyphes" +   GlyphBoardSelectionTab -> "glyphboards" +   GlyphManagementTab -> "glyphmanagement" +  get_glyph_slot : Type -> (Int, Int)  get_glyph_slot ui = ui.glyph_slot diff --git a/src/roster-editor/src/View/MainMenu.elm b/src/roster-editor/src/View/MainMenu.elm index b40d706..d79e05c 100644 --- a/src/roster-editor/src/View/MainMenu.elm +++ b/src/roster-editor/src/View/MainMenu.elm @@ -21,7 +21,10 @@ import Struct.UI  get_main_menu_button_html : (Html.Html Struct.Event.Type)  get_main_menu_button_html =     (Html.button -      [ (Html.Events.onClick Struct.Event.GoToMainMenu) ] +      [ +         (Html.Events.onClick Struct.Event.GoToMainMenu), +         (Html.Attributes.class "main-menu") +      ]        [ (Html.text "Main Menu") ]     ) | 


