Mascali
/
shapez.io
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
tobspr 2020-09-19 15:14:10 +02:00
parent 6b7cfb48b3
commit 8fa348ef30
4 changed files with 16 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/css/ingame_hud/game_menu.scss
View File

@ -8,53 +8,6 @@
backdrop-filter: blur(D(1px)); 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,
> .button { > .button {
@include PlainText; @include PlainText;

10
src/css/states/main_menu.scss
View File

@ -124,10 +124,13 @@
} }
.steamLink { .steamLink {
align-self: center;
justify-self: center;
width: 100%; width: 100%;
@include S(height, 40px); @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; overflow: hidden;
display: block; display: block;
text-indent: -999em; text-indent: -999em;
@ -137,8 +140,11 @@
transition: all 0.12s ease-in; transition: all 0.12s ease-in;
transition-property: opacity, transform; transition-property: opacity, transform;
transform: skewX(-0.5deg); transform: skewX(-0.5deg);
@include S(border-radius, $globalBorderRadius);
&:hover { &:hover {
transform: skewX(-1deg) scale(1.02); transform: scale(1.02);
opacity: 0.9; opacity: 0.9;
} }
} }

3
src/js/game/hud/parts/game_menu.js
View File

@ -17,8 +17,7 @@ export class HUDGameMenu extends BaseHUDPart {
label: "Upgrades", label: "Upgrades",
handler: () => this.root.hud.parts.shop.show(), handler: () => this.root.hud.parts.shop.show(),
keybinding: KEYMAPPINGS.ingame.menuOpenShop, keybinding: KEYMAPPINGS.ingame.menuOpenShop,
// badge: () => this.root.hubGoals.getAvailableUpgradeCount(), badge: () => this.root.hubGoals.getAvailableUpgradeCount(),
badge: () => 1,
notification: /** @type {[string, enumNotificationType]} */ ([ notification: /** @type {[string, enumNotificationType]} */ ([
T.ingame.notifications.newUpgrade, T.ingame.notifications.newUpgrade,
enumNotificationType.upgrade, enumNotificationType.upgrade,

14
src/js/game/hud/parts/keybinding_overlay.js
View File

@ -162,13 +162,6 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
condition: () => this.mapOverviewActive && !this.blueprintPlacementActive, condition: () => this.mapOverviewActive && !this.blueprintPlacementActive,
}, },
{
// Pipette
label: T.ingame.keybindingsOverlay.pipette,
keys: [k.placement.pipette],
condition: () => !this.mapOverviewActive && !this.blueprintPlacementActive,
},
{ {
// Cancel placement // Cancel placement
label: T.ingame.keybindingsOverlay.stopPlacement, label: T.ingame.keybindingsOverlay.stopPlacement,
@ -184,6 +177,13 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
!this.anyPlacementActive && !this.mapOverviewActive && !this.anythingSelectedOnMap, !this.anyPlacementActive && !this.mapOverviewActive && !this.anythingSelectedOnMap,
}, },
{
// Pipette
label: T.ingame.keybindingsOverlay.pipette,
keys: [k.placement.pipette],
condition: () => !this.mapOverviewActive && !this.blueprintPlacementActive,
},
{ {
// Area select // Area select
label: T.ingame.keybindingsOverlay.selectBuildings, label: T.ingame.keybindingsOverlay.selectBuildings,