Merge branch 'notnite/moonlight-updating' of github.com:moonlight-mod…

…/moonlight into notnite/moonlight-updating
moonlight-mod · Oct 9, 2024 · 1f53eb6 · 1f53eb6
2 parents 6071ab9 + fde3b8e
commit 1f53eb6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/core-extensions/src/moonbase/index.tsx b/packages/core-extensions/src/moonbase/index.tsx
@@ -48,5 +48,6 @@ export const webpackModules: Record<string, ExtensionWebpackModule> = {
 export const styles = [
  ".moonbase-settings > :first-child { margin-top: 0px; }",
  "textarea.moonbase-resizeable { resize: vertical }",
- ".moonbase-updates-notice { background-color: #222034; color: #FFFBA6; }"
+ ".moonbase-updates-notice { background-color: #222034; color: #FFFBA6; line-height: unset; height: 36px; }",
+ ".moonbase-updates-notice_text-wrapper { display: inline-flex; align-items: center; line-height: 36px; gap: 2px; }"
 ];
diff --git a/...ns/src/moonbase/webpackModules/updates.ts → ...s/src/moonbase/webpackModules/updates.tsx b/...ns/src/moonbase/webpackModules/updates.ts → ...s/src/moonbase/webpackModules/updates.tsx
@@ -2,6 +2,8 @@ import spacepack from "@moonlight-mod/wp/spacepack_spacepack";
 import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";
 import Notices from "@moonlight-mod/wp/notices_notices";
 import { MoonlightBranch } from "types/src";
+import React from "@moonlight-mod/wp/react";
+import * as Components from "@moonlight-mod/wp/discord/components/common/index";
 
 // FIXME: not indexed as importable
 const Constants = spacepack.require("discord/Constants");
@@ -10,6 +12,8 @@ const UserSettingsSections = spacepack.findObjectFromKey(
  "APPEARANCE_THEME_PICKER"
 );
 
+const { ThemeDarkIcon } = Components;
+
 function plural(str: string, num: number) {
  return `${str}${num > 1 ? "s" : ""}`;
 }
@@ -58,7 +62,12 @@ function listener() {
  if (message != null) message += ".";
 
  Notices.addNotice({
- element: message,
+ element: (
+ <div className="moonbase-updates-notice_text-wrapper">
+ <ThemeDarkIcon size="sm" color="currentColor" />
+ {message}
+ </div>
+ ),
  color: "moonbase-updates-notice",
  buttons: [
  {