Fix wires toolbar not being hidden when pressing f2

This commit is contained in:
tobspr 2020-08-28 23:00:09 +02:00
parent a67448fbdf
commit e70f30ed17
1 changed files with 124 additions and 124 deletions

View File

@ -1,124 +1,124 @@
// Control here whether to inline all resources or instead load them // Control here whether to inline all resources or instead load them
@function uiResource($pth) { @function uiResource($pth) {
@if (str-index($string: $pth, $substring: ".noinline")) { @if (str-index($string: $pth, $substring: ".noinline")) {
@return resolve($pth); @return resolve($pth);
} }
@return inline($pth); @return inline($pth);
} }
@import "icons"; @import "icons";
@import "trigonometry"; @import "trigonometry";
@import "material_colors"; @import "material_colors";
@import "dynamic_ui"; @import "dynamic_ui";
@import "variables"; @import "variables";
@import "mixins"; @import "mixins";
@import "common"; @import "common";
@import "animations"; @import "animations";
@import "game_state"; @import "game_state";
@import "application_error"; @import "application_error";
@import "textual_game_state"; @import "textual_game_state";
@import "adinplay"; @import "adinplay";
@import "states/preload"; @import "states/preload";
@import "states/main_menu"; @import "states/main_menu";
@import "states/ingame"; @import "states/ingame";
@import "states/keybindings"; @import "states/keybindings";
@import "states/settings"; @import "states/settings";
@import "states/about"; @import "states/about";
@import "states/mobile_warning"; @import "states/mobile_warning";
@import "states/changelog"; @import "states/changelog";
@import "ingame_hud/buildings_toolbar"; @import "ingame_hud/buildings_toolbar";
@import "ingame_hud/building_placer"; @import "ingame_hud/building_placer";
@import "ingame_hud/beta_overlay"; @import "ingame_hud/beta_overlay";
@import "ingame_hud/keybindings_overlay"; @import "ingame_hud/keybindings_overlay";
@import "ingame_hud/unlock_notification"; @import "ingame_hud/unlock_notification";
@import "ingame_hud/shop"; @import "ingame_hud/shop";
@import "ingame_hud/game_menu"; @import "ingame_hud/game_menu";
@import "ingame_hud/dialogs"; @import "ingame_hud/dialogs";
@import "ingame_hud/vignette_overlay"; @import "ingame_hud/vignette_overlay";
@import "ingame_hud/statistics"; @import "ingame_hud/statistics";
@import "ingame_hud/pinned_shapes"; @import "ingame_hud/pinned_shapes";
@import "ingame_hud/notifications"; @import "ingame_hud/notifications";
@import "ingame_hud/settings_menu"; @import "ingame_hud/settings_menu";
@import "ingame_hud/debug_info"; @import "ingame_hud/debug_info";
@import "ingame_hud/entity_debugger"; @import "ingame_hud/entity_debugger";
@import "ingame_hud/tutorial_hints"; @import "ingame_hud/tutorial_hints";
@import "ingame_hud/watermark"; @import "ingame_hud/watermark";
@import "ingame_hud/blueprint_placer"; @import "ingame_hud/blueprint_placer";
@import "ingame_hud/waypoints"; @import "ingame_hud/waypoints";
@import "ingame_hud/interactive_tutorial"; @import "ingame_hud/interactive_tutorial";
@import "ingame_hud/color_blind_helper"; @import "ingame_hud/color_blind_helper";
@import "ingame_hud/shape_viewer"; @import "ingame_hud/shape_viewer";
@import "ingame_hud/sandbox_controller"; @import "ingame_hud/sandbox_controller";
// prettier-ignore // prettier-ignore
$elements: $elements:
// Base // Base
ingame_Canvas, ingame_Canvas,
ingame_VignetteOverlay, ingame_VignetteOverlay,
// Ingame overlays // Ingame overlays
ingame_HUD_Waypoints, ingame_HUD_Waypoints,
ingame_HUD_PlacementHints, ingame_HUD_PlacementHints,
ingame_HUD_PlacerVariants, ingame_HUD_PlacerVariants,
// Regular hud // Regular hud
ingame_HUD_PinnedShapes, ingame_HUD_PinnedShapes,
ingame_HUD_GameMenu, ingame_HUD_GameMenu,
ingame_HUD_KeybindingOverlay, ingame_HUD_KeybindingOverlay,
ingame_HUD_Notifications, ingame_HUD_Notifications,
ingame_HUD_DebugInfo, ingame_HUD_DebugInfo,
ingame_HUD_EntityDebugger, ingame_HUD_EntityDebugger,
ingame_HUD_InteractiveTutorial, ingame_HUD_InteractiveTutorial,
ingame_HUD_TutorialHints, ingame_HUD_TutorialHints,
ingame_HUD_buildings_toolbar, ingame_HUD_buildings_toolbar,
ingame_HUD_wires_toolbar, ingame_HUD_wires_toolbar,
ingame_HUD_BlueprintPlacer, ingame_HUD_BlueprintPlacer,
ingame_HUD_Waypoints_Hint, ingame_HUD_Waypoints_Hint,
ingame_HUD_Watermark, ingame_HUD_Watermark,
ingame_HUD_ColorBlindBelowTileHelper, ingame_HUD_ColorBlindBelowTileHelper,
ingame_HUD_SandboxController, ingame_HUD_SandboxController,
// Overlays // Overlays
ingame_HUD_BetaOverlay, ingame_HUD_BetaOverlay,
// Dialogs // Dialogs
ingame_HUD_Shop, ingame_HUD_Shop,
ingame_HUD_Statistics, ingame_HUD_Statistics,
ingame_HUD_ShapeViewer, ingame_HUD_ShapeViewer,
ingame_HUD_UnlockNotification, ingame_HUD_UnlockNotification,
ingame_HUD_SettingsMenu, ingame_HUD_SettingsMenu,
ingame_HUD_ModalDialogs; ingame_HUD_ModalDialogs;
$zindex: 100; $zindex: 100;
@each $elem in $elements { @each $elem in $elements {
##{$elem} { ##{$elem} {
z-index: $zindex; z-index: $zindex;
} }
$zindex: $zindex + 10; $zindex: $zindex + 10;
} }
body.uiHidden { body.uiHidden {
#ingame_HUD_buildings_toolbar, .ingame_buildingsToolbar,
#ingame_HUD_PlacementHints, #ingame_HUD_PlacementHints,
#ingame_HUD_GameMenu, #ingame_HUD_GameMenu,
#ingame_HUD_PinnedShapes, #ingame_HUD_PinnedShapes,
#ingame_HUD_Notifications, #ingame_HUD_Notifications,
#ingame_HUD_TutorialHints, #ingame_HUD_TutorialHints,
#ingame_HUD_Waypoints, #ingame_HUD_Waypoints,
#ingame_HUD_Waypoints_Hint { #ingame_HUD_Waypoints_Hint {
display: none !important; display: none !important;
} }
} }
body.modalDialogActive, body.modalDialogActive,
body.externalAdOpen, body.externalAdOpen,
body.ingameDialogOpen { body.ingameDialogOpen {
> *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog):not(.gameLoadingOverlay):not(#ingame_HUD_ModalDialogs):not(.noBlur) { > *:not(.ingameDialog):not(.modalDialogParent):not(.loadingDialog):not(.gameLoadingOverlay):not(#ingame_HUD_ModalDialogs):not(.noBlur) {
// filter: blur(5px) !important; // filter: blur(5px) !important;
} }
} }