diff --git a/src/css/ingame_hud/game_menu.scss b/src/css/ingame_hud/game_menu.scss index 258d098d..0971bd29 100644 --- a/src/css/ingame_hud/game_menu.scss +++ b/src/css/ingame_hud/game_menu.scss @@ -8,53 +8,6 @@ backdrop-filter: blur(D(1px)); - // > .menuButtons { - // position: relative; - // display: flex; - // flex-grow: 1; - // @include S(padding, 5px, 4px); - // justify-content: flex-end; - // @include S(margin-left, 20px); - - // > .button { - // @include S(width, 30px); - // @include S(height, 30px); - // display: inline-block; - // background: center center / 60% no-repeat; - // pointer-events: all; - // cursor: pointer; - // transition: all 0.12s ease-in-out; - // transition-property: opacity, transform; - // will-change: opacity; - // opacity: 0.5; - // &:hover { - // opacity: 0.7; - // } - - // @include DarkThemeOverride { - // opacity: 0.9; - // &:hover { - // opacity: 0.6; - // } - // } - // @include S(margin-left, 5px); - // position: relative; - - // @include IncreasedClickArea(0px); - - // @include DarkThemeInvert; - - // &.save { - // background-image: uiResource("icons/save.png"); - // - // } - - // &.settings { - // background-image: uiResource("icons/settings_menu_settings.png"); - // } - // } - // } - > button, > .button { @include PlainText; diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index a18c10ad..e61df636 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -124,10 +124,13 @@ } .steamLink { + align-self: center; + justify-self: center; width: 100%; @include S(height, 40px); + @include S(width, 180px); - background: uiResource("get_on_steam.png") center center / contain no-repeat; + background: #171a23 uiResource("get_on_steam.png") center center / contain no-repeat; overflow: hidden; display: block; text-indent: -999em; @@ -137,8 +140,11 @@ transition: all 0.12s ease-in; transition-property: opacity, transform; transform: skewX(-0.5deg); + + @include S(border-radius, $globalBorderRadius); + &:hover { - transform: skewX(-1deg) scale(1.02); + transform: scale(1.02); opacity: 0.9; } } diff --git a/src/js/game/hud/parts/game_menu.js b/src/js/game/hud/parts/game_menu.js index 27290fa1..2a172ab2 100644 --- a/src/js/game/hud/parts/game_menu.js +++ b/src/js/game/hud/parts/game_menu.js @@ -17,8 +17,7 @@ export class HUDGameMenu extends BaseHUDPart { label: "Upgrades", handler: () => this.root.hud.parts.shop.show(), keybinding: KEYMAPPINGS.ingame.menuOpenShop, - // badge: () => this.root.hubGoals.getAvailableUpgradeCount(), - badge: () => 1, + badge: () => this.root.hubGoals.getAvailableUpgradeCount(), notification: /** @type {[string, enumNotificationType]} */ ([ T.ingame.notifications.newUpgrade, enumNotificationType.upgrade, diff --git a/src/js/game/hud/parts/keybinding_overlay.js b/src/js/game/hud/parts/keybinding_overlay.js index d31ee746..834a7385 100644 --- a/src/js/game/hud/parts/keybinding_overlay.js +++ b/src/js/game/hud/parts/keybinding_overlay.js @@ -162,13 +162,6 @@ export class HUDKeybindingOverlay extends BaseHUDPart { condition: () => this.mapOverviewActive && !this.blueprintPlacementActive, }, - { - // Pipette - label: T.ingame.keybindingsOverlay.pipette, - keys: [k.placement.pipette], - condition: () => !this.mapOverviewActive && !this.blueprintPlacementActive, - }, - { // Cancel placement label: T.ingame.keybindingsOverlay.stopPlacement, @@ -184,6 +177,13 @@ export class HUDKeybindingOverlay extends BaseHUDPart { !this.anyPlacementActive && !this.mapOverviewActive && !this.anythingSelectedOnMap, }, + { + // Pipette + label: T.ingame.keybindingsOverlay.pipette, + keys: [k.placement.pipette], + condition: () => !this.mapOverviewActive && !this.blueprintPlacementActive, + }, + { // Area select label: T.ingame.keybindingsOverlay.selectBuildings,