From 7f5af52e203ef6c1bcfd83a1ea462c5d3aecba66 Mon Sep 17 00:00:00 2001 From: Bastard Operator Date: Sat, 9 Jan 2021 00:19:03 +0100 Subject: [PATCH] Remove #fedilove from all messages? + Small few improvements: * Redirect to / when logged out * Replace #fedilove on all messages to nothing * Improve buttons by default --- src/routes/_actions/instances.js | 2 +- src/routes/_utils/massageUserText.js | 1 + src/scss/themes/ozark.scss | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/routes/_actions/instances.js b/src/routes/_actions/instances.js index a1812af8..362c2418 100644 --- a/src/routes/_actions/instances.js +++ b/src/routes/_actions/instances.js @@ -84,7 +84,7 @@ export async function logOutOfInstance (instanceName, message) { const { enableGrayscale } = store.get() switchToTheme(instanceThemes[newInstance], enableGrayscale) /* no await */ database.clearDatabaseForInstance(instanceName) - goto('/settings/instances') + window.location.href = '/'; } function setStoreVerifyCredentials (instanceName, thisVerifyCredentials) { diff --git a/src/routes/_utils/massageUserText.js b/src/routes/_utils/massageUserText.js index f5e636d3..be9c3020 100644 --- a/src/routes/_utils/massageUserText.js +++ b/src/routes/_utils/massageUserText.js @@ -3,6 +3,7 @@ import { massageStatusPlainText } from './massageStatusPlainText' export function massageUserText (text, emojis, $autoplayGifs) { text = text || '' + text = text.replace(/]+>.*?#.*?>fedilove<.*?<\/a>/gi, ''); text = emojifyText(text, emojis, $autoplayGifs) text = massageStatusPlainText(text) return text diff --git a/src/scss/themes/ozark.scss b/src/scss/themes/ozark.scss index 7224a703..689fd38a 100644 --- a/src/scss/themes/ozark.scss +++ b/src/scss/themes/ozark.scss @@ -87,6 +87,16 @@ nav#main-nav > ul.main-nav-ul { } +div.modal-dialog { + div.close-dialog-button-wrapper { + display: none !important; + } +} + +button { + border: none !important; +} + div.main-content { background: var(--main-bg); } div.no-script { display: none; }