From 4681c5a3e30df8fbe1bbbca54f4bd38cf33a0de6 Mon Sep 17 00:00:00 2001
From: Bastard Operator <bofh@nogafam.es>
Date: Wed, 6 Jan 2021 20:30:30 +0100
Subject: [PATCH] Removed theme selection option in settings + UI improvements

---
 src/routes/_components/LoadingSpinner.html                | 2 +-
 src/routes/_components/dialog/components/ModalDialog.html | 2 +-
 src/routes/_pages/settings/general.html                   | 6 ------
 src/routes/_pages/settings/instances/[instanceName].html  | 4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/routes/_components/LoadingSpinner.html b/src/routes/_components/LoadingSpinner.html
index f9202038..8328eaf9 100644
--- a/src/routes/_components/LoadingSpinner.html
+++ b/src/routes/_components/LoadingSpinner.html
@@ -5,7 +5,7 @@
 />
 <style>
   :global(.loading-spinner-icon) {
-    fill: var(--svg-fill);
+    fill: var(--nav-svg-fill);
   }
 
   :global(.loading-spinner-icon.mask-style) {
diff --git a/src/routes/_components/dialog/components/ModalDialog.html b/src/routes/_components/dialog/components/ModalDialog.html
index aa2aafa5..f6fb2974 100644
--- a/src/routes/_components/dialog/components/ModalDialog.html
+++ b/src/routes/_components/dialog/components/ModalDialog.html
@@ -104,7 +104,7 @@
   }
   :global(.close-dialog-button-svg) {
     padding: 10px;
-    fill: var(--button-primary-text);
+    fill: #a49f9f;
     width: 24px;
     height: 24px;
     flex: 1;
diff --git a/src/routes/_pages/settings/general.html b/src/routes/_pages/settings/general.html
index 9e15f862..e51c8b26 100644
--- a/src/routes/_pages/settings/general.html
+++ b/src/routes/_pages/settings/general.html
@@ -93,15 +93,10 @@
     </label>
   </form>
 
-  {#if $isUserLoggedIn }
-    <h2>{themeTitle}</h2>
-    <ThemeSettings instanceName={$currentInstance} />
-  {/if}
 </SettingsLayout>
 <UISettingsStyles />
 <script>
   import SettingsLayout from '../../_components/settings/SettingsLayout.html'
-  import ThemeSettings from '../../_components/settings/instance/ThemeSettings.html'
   import { store } from '../../_store/store'
   import Tooltip from '../../_components/Tooltip.html'
   import UISettingsStyles from '../../_components/settings/UISettingsStyles.html'
@@ -110,7 +105,6 @@
   export default {
     components: {
       SettingsLayout,
-      ThemeSettings,
       Tooltip,
       UISettingsStyles
     },
diff --git a/src/routes/_pages/settings/instances/[instanceName].html b/src/routes/_pages/settings/instances/[instanceName].html
index c97fad5f..5ab694a2 100644
--- a/src/routes/_pages/settings/instances/[instanceName].html
+++ b/src/routes/_pages/settings/instances/[instanceName].html
@@ -10,8 +10,6 @@
     <NotificationFilterSettings {instanceName} />
     <h2>{intl.pushNotifications}</h2>
     <PushNotificationSettings {instanceName} />
-    <h2>{intl.theme}</h2>
-    <ThemeSettings {instanceName} />
 
     <InstanceActions {instanceName} />
   {/if}
@@ -30,7 +28,6 @@
   import HomeTimelineFilterSettings from '../../../_components/settings/instance/HomeTimelineFilterSettings.html'
   import NotificationFilterSettings from '../../../_components/settings/instance/NotificationFilterSettings.html'
   import PushNotificationSettings from '../../../_components/settings/instance/PushNotificationSettings.html'
-  import ThemeSettings from '../../../_components/settings/instance/ThemeSettings.html'
   import InstanceActions from '../../../_components/settings/instance/InstanceActions.html'
   import { updateVerifyCredentialsForInstance } from '../../../_actions/instances'
 
@@ -48,7 +45,6 @@
       SettingsLayout,
       InstanceUserProfile,
       PushNotificationSettings,
-      ThemeSettings,
       InstanceActions,
       HomeTimelineFilterSettings,
       NotificationFilterSettings