Merge branch 'main' into context-menu-ban-kick
This commit is contained in:
commit
2c30b4e0cd
35 changed files with 789 additions and 695 deletions
|
@ -1,9 +1,9 @@
|
|||
export default (): "12" | "24" => {
|
||||
const format = settingsLoad().timeFormat?.format ?? "auto"
|
||||
const format = settingsLoad().timeFormat || "Auto"
|
||||
|
||||
if (format == "12") {
|
||||
if (format == "4:18 PM") {
|
||||
return "12"
|
||||
} else if (format == "24") {
|
||||
} else if (format == "16:18") {
|
||||
return "24"
|
||||
}
|
||||
|
||||
|
|
|
@ -2,20 +2,17 @@ let styleLinkElement: HTMLLinkElement | null;
|
|||
let layoutLinkElement: HTMLLinkElement | null;
|
||||
|
||||
|
||||
export default () => {
|
||||
export default () => {
|
||||
const runtimeConfig = useRuntimeConfig()
|
||||
const baseURL = runtimeConfig.app.baseURL;
|
||||
|
||||
let currentStyle = settingsLoad().selectedThemeStyle ?? undefined
|
||||
let currentLayout = settingsLoad().selectedThemeLayout ?? `${baseURL}themes/layout/gorb.css`
|
||||
|
||||
if (!currentStyle) {
|
||||
if (prefersLight()) {
|
||||
currentStyle = `${baseURL}themes/style/light.css`
|
||||
} else {
|
||||
currentStyle = `${baseURL}themes/style/dark.css`
|
||||
}
|
||||
}
|
||||
let currentStyle = settingsLoad().selectedThemeStyle || (
|
||||
prefersLight()
|
||||
? `${baseURL}themes/style/light.css`
|
||||
: `${baseURL}themes/style/dark.css`
|
||||
);
|
||||
|
||||
let currentLayout = settingsLoad().selectedThemeLayout || `${baseURL}themes/layout/gorb.css`
|
||||
|
||||
if (styleLinkElement) {
|
||||
styleLinkElement.href = currentStyle;
|
||||
|
|
|
@ -9,7 +9,7 @@ export default (element: HTMLDivElement, props: MessageProps) => {
|
|||
const messageBox = document.getElementById("message-box") as HTMLDivElement;
|
||||
if (messageBox) {
|
||||
const div = document.createElement("div");
|
||||
const messageReply = h(MessageReply, { author: getDisplayName(props.author), text: props.text || "", id: props.message.uuid, replyId: props.replyMessage?.uuid || element.dataset.messageId!, maxWidth: "full" });
|
||||
const messageReply = h(MessageReply, { author: getDisplayName(props.message.member), text: props.message.message || "", id: props.message.uuid, replyId: props.replyMessage?.uuid || element.dataset.messageId!, maxWidth: "full" });
|
||||
messageBox.prepend(div);
|
||||
render(messageReply, div);
|
||||
const message = document.querySelector(`.message[data-message-id='${props.message.uuid}']`);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue