From d84ae72902aacf3140147b1b43aa813a89170854 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Tue, 27 Aug 2019 22:12:22 +0200
Subject: [PATCH] Improved default Qoto theme to match recent updates.

---
 app/javascript/styles/qoto.scss | 49 +++++++++++++++++++++++++++++++++
 config/locales/en.yml           |  2 +-
 config/locales/en_GB.yml        |  9 +++++-
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/qoto.scss b/app/javascript/styles/qoto.scss
index e1bb8a65ba..82fcde9dee 100644
--- a/app/javascript/styles/qoto.scss
+++ b/app/javascript/styles/qoto.scss
@@ -12,3 +12,52 @@
 .detailed-status__meta {
     background-color: unset!important;
 }
+
+.status__expand {
+    background-color: unset!important;
+}
+
+.status__action-bar__counter {
+    background-color: unset!important;
+}
+
+.drawer__inner {
+    background-color: #ffffff!important;
+}
+
+.columns-area {
+    background-color: #f0f0f0!important;
+}
+
+.column-header {
+    background-color: #ffffff!important;
+}
+
+.column-header__button {
+    background-color: #ffffff!important;
+}
+
+.column-header__back-button {
+    background-color: #ffffff!important;
+}
+
+.search__input {
+    background-color: #ffffff!important;
+}
+
+.drawer__tab {
+    background-color: unset!important;
+}
+
+.poll__input.active {
+    border-color: #3c754d!important;
+    background: #3c754d!important;
+}
+
+.account__header__tabs, .account__header__tabs__name, .account__header__tabs__buttons, .account__header__bio, .account__header__fields, .account__header__extra__links {
+    background-color: #ffffff!important;
+}
+
+.account__section-headline {
+    background-color: #e6ebf0!important;
+}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8e9abf9904..445555397e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1021,7 +1021,7 @@ en:
     mastodon-wide-light: Mastodon Default Theme, Full Width (light)
     mastodon-wide-dark: Mastodon Default Theme, Full Width (dark)
     contrast: Mastodon (High contrast)
-    default: Mastodon (Dark)
+    default: QOTO Default Theme
     mastodon-light: Mastodon (Light)
   time:
     formats:
diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml
index 33ba162100..d07c7ad3fe 100644
--- a/config/locales/en_GB.yml
+++ b/config/locales/en_GB.yml
@@ -977,8 +977,15 @@ en_GB:
       <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
     title: "%{instance} Terms of Service and Privacy Policy"
   themes:
+    mastodon: Mastodon Default Theme (dark)
+    blue: The Blue Theme (light)
+    mastoblue: The Masto Blue Theme (light)
+    material-light: Material Theme (light)
+    material-dark: Material Theme (dark)
+    mastodon-wide-light: Mastodon Default Theme, Full Width (light)
+    mastodon-wide-dark: Mastodon Default Theme, Full Width (dark)
     contrast: Mastodon (High contrast)
-    default: Mastodon (Dark)
+    default: QOTO Default Theme
     mastodon-light: Mastodon (Light)
   time:
     formats:
-- 
GitLab