Merge branch 'develop' into steam-beta

Raphiiko · Apr 23, 2024 · 9caa4c4 · 9caa4c4
2 parents 6d7c915 + 4cabc71
commit 9caa4c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src-ui/app/services/discord.service.ts b/src-ui/app/services/discord.service.ts
@@ -61,7 +61,7 @@ export class DiscordService {
     await invoke<boolean>('discord_update_activity', {
       details: this.translate.instant('discord.details'),
       state: this.translate.instant(sleepMode ? 'discord.state.sleeping' : 'discord.state.awake'),
-      asset_label: this.translate.instant(
+      assetLabel: this.translate.instant(
         sleepMode ? 'discord.label.sleeping' : 'discord.label.awake'
       ),
       asset: sleepMode ? 'asleep' : 'awake',

diff --git a/...views/dashboard-view/views/join-notifications-view/join-notifications-view.component.scss b/...views/dashboard-view/views/join-notifications-view/join-notifications-view.component.scss
@@ -30,3 +30,7 @@
     }
   }
 }
+
+.preset-select-box {
+  min-width: 14em;
+}
diff --git a/...n-leave-disable-sleepmode-modal/player-join-leave-disable-sleep-mode-modal.component.scss b/...n-leave-disable-sleepmode-modal/player-join-leave-disable-sleep-mode-modal.component.scss
@@ -3,3 +3,8 @@
   flex-direction: row;
   align-items: stretch;
 }
+
+
+.preset-select-box {
+  min-width: 14em;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,3 +30,7 @@ @@
         }
       }
     }
+    .preset-select-box {
+      min-width: 14em;
+    }