From 3b200705ed0b9b37158ff758268a4531e8b5b29d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 12 Feb 2019 08:48:27 +0000
Subject: [PATCH] Remove light theme

---
 res/themes/dark/css/dark.scss                |   6 +-
 res/themes/{light => dharma}/css/_paths.scss |   0
 res/themes/dharma/css/dharma.scss            |   2 +-
 res/themes/light/css/_base.scss              | 276 -------------------
 res/themes/light/css/_fonts.scss             |  67 -----
 res/themes/light/css/light.scss              |   4 -
 6 files changed, 4 insertions(+), 351 deletions(-)
 rename res/themes/{light => dharma}/css/_paths.scss (100%)
 delete mode 100644 res/themes/light/css/_base.scss
 delete mode 100644 res/themes/light/css/_fonts.scss
 delete mode 100644 res/themes/light/css/light.scss

diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index a7d18fa1a6..a869dc39e3 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -1,5 +1,5 @@
-@import "../../light/css/_paths.scss";
-@import "../../light/css/_fonts.scss";
-@import "../../light/css/_base.scss";
+@import "../../dharma/css/_paths.scss";
+@import "../../dharma/css/_fonts.scss";
+@import "../../dharma/css/_dharma.scss";
 @import "_dark.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/res/themes/light/css/_paths.scss b/res/themes/dharma/css/_paths.scss
similarity index 100%
rename from res/themes/light/css/_paths.scss
rename to res/themes/dharma/css/_paths.scss
diff --git a/res/themes/dharma/css/dharma.scss b/res/themes/dharma/css/dharma.scss
index 24dc0ce18d..032154f999 100644
--- a/res/themes/dharma/css/dharma.scss
+++ b/res/themes/dharma/css/dharma.scss
@@ -1,4 +1,4 @@
-@import "../../light/css/_paths.scss";
+@import "_paths.scss";
 @import "_fonts.scss";
 @import "_dharma.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
deleted file mode 100644
index e2aa005b68..0000000000
--- a/res/themes/light/css/_base.scss
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Open Sans lacks combining diacritics, so these will fall through
-   to the next font.  Helevetica's diacritics however do not combine
-   nicely with Open Sans (on OSX, at least) and result in a huge
-   horizontal mess.  Arial empirically gets it right, hence prioritising
-   Arial here. */
-$font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
-
-// typical text (dark-on-white in light skin)
-$primary-fg-color: #454545;
-$primary-bg-color: #ffffff;
-
-// used for dialog box text
-$light-fg-color: #747474;
-
-// used for focusing form controls
-$focus-bg-color: #dddddd;
-
-// button UI (white-on-green in light skin)
-$accent-fg-color: #ffffff;
-$accent-color: #76CFA6;
-$accent-color-alt: $accent-color;
-$accent-color-50pct: #76CFA67F;
-
-$selection-fg-color: $primary-bg-color;
-
-$focus-brightness: 125%;
-
-// red warning colour
-$warning-color: #ff0064;
-// background colour for warnings
-$warning-bg-color: #DF2A8B;
-$info-bg-color: #2A9EDF;
-$mention-user-pill-bg-color: #ff0064;
-$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
-
-// pinned events indicator
-$pinned-unread-color: #ff0064; // $warning-color
-$pinned-color: #888;
-
-// informational plinth
-$info-plinth-bg-color: #f7f7f7;
-$info-plinth-fg-color: #888;
-
-$preview-bar-bg-color: #f7f7f7;
-
-// left-panel style muted accent color
-$secondary-accent-color: #eaf5f0;
-$tertiary-accent-color: #d3efe1;
-
-$tagpanel-bg-color: $tertiary-accent-color;
-
-// used by RoomDirectory permissions
-$plinth-bg-color: $secondary-accent-color;
-
-// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
-
-// used by AddressSelector
-$selected-color: $secondary-accent-color;
-
-// selected for hoverover & selected event tiles
-$event-selected-color: #f7f7f7;
-
-// used for the hairline dividers in RoomView
-$primary-hairline-color: #e5e5e5;
-
-// used for the border of input text fields
-$input-border-color: #f0f0f0;
-$input-border-dark-color: #b8b8b8;
-
-$input-darker-bg-color: #c1c9d6;
-$input-darker-fg-color: #9fa9ba;
-$button-bg-color: #7ac9a1;
-$button-fg-color: white;
-// apart from login forms, which have stronger border
-$strong-input-border-color: #c7c7c7;
-$input-focused-border-color: #238cf5;
-$input-valid-border-color: #7ac9a1;
-
-$field-focused-label-bg-color: #ffffff;
-
-// used for UserSettings EditableText
-$input-underline-color: rgba(151, 151, 151, 0.5);
-$input-fg-color: rgba(74, 74, 74, 0.9);
-// scrollbars
-$scrollbar-thumb-color: rgba(0, 0, 0, 0.2);
-$scrollbar-track-color: transparent;
-// context menus
-$menu-border-color: rgba(187, 187, 187, 0.5);
-$menu-bg-color: #f6f6f6;
-$menu-selected-color: #f5f8fa;
-
-$avatar-initial-color: #ffffff;
-$avatar-bg-color: #ffffff;
-
-$h3-color: #3d3b39;
-
-$dialog-title-fg-color: #454545;
-$dialog-backdrop-color: rgba(46, 48, 51, 0.38);
-$dialog-shadow-color: rgba(0, 0, 0, 0.48);
-$dialog-close-fg-color: #9fa9ba;
-
-$dialog-background-bg-color: #e9e9e9;
-$lightbox-background-bg-color: #000;
-
-$greyed-fg-color: #888;
-
-$neutral-badge-color: #dbdbdb;
-
-$preview-widget-bar-color: #ddd;
-$preview-widget-fg-color: $greyed-fg-color;
-
-$blockquote-bar-color: #ddd;
-$blockquote-fg-color: #777;
-
-$settings-grey-fg-color: #a2a2a2;
-$settings-profile-placeholder-bg-color: #e7e7e7;
-$settings-profile-overlay-bg-color: #000;
-$settings-profile-overlay-placeholder-bg-color: transparent;
-$settings-profile-overlay-fg-color: #fff;
-$settings-profile-overlay-placeholder-fg-color: #454545;
-$settings-subsection-fg-color: #61708b;
-
-$voip-decline-color: #f48080;
-$voip-accept-color: #80f480;
-
-$rte-bg-color: #e9e9e9;
-$rte-code-bg-color: rgba(0, 0, 0, 0.04);
-$rte-room-pill-color: #aaa;
-$rte-group-pill-color: #aaa;
-
-$topleftmenu-color: $primary-fg-color;
-$roomheader-color: $primary-fg-color;
-$roomheader-addroom-color: $primary-bg-color;
-$roomtopic-color: $settings-grey-fg-color;
-$eventtile-meta-color: $roomtopic-color;
-
-$composer-e2e-icon-color: #c9ced6;
-$header-divider-color: #e6eaee;
-// ********************
-
-$roomtile-name-color: rgba(69, 69, 69, 0.8);
-$roomtile-selected-color: $roomtile-name-color;
-$roomtile-notified-color: $roomtile-name-color;
-$roomtile-selected-bg-color: rgba(255, 255, 255, 0.8);
-$roomtile-focused-bg-color: rgba(255, 255, 255, 0.9);
-
-$username-variant1-color: #1e7ddc;
-$username-variant2-color: #a756a8;
-$username-variant3-color: #7ac9a1;
-$username-variant4-color: #f2809d;
-$username-variant5-color: #ffc666;
-$username-variant6-color: #76ddd7;
-$username-variant7-color: #45529b;
-$username-variant8-color: #bfd251;
-
-$roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
-
-$roomsublist-background: rgba(0, 0, 0, 0.05);
-$roomsublist-label-fg-color: $h3-color;
-$roomsublist-label-bg-color: $tertiary-accent-color;
-$roomsublist-chevron-color: $accent-color;
-
-$panel-divider-color: rgba(118, 207, 166, 0.2);
-
-// ********************
-
-$widget-menu-bar-bg-color: $tertiary-accent-color;
-
-// ********************
-
-// event tile lifecycle
-$event-encrypting-color: #abddbc;
-$event-sending-color: #ddd;
-$event-notsent-color: #f44;
-
-// event redaction
-$event-redacted-fg-color: #e2e2e2;
-$event-redacted-border-color: #cccccc;
-
-// event timestamp
-$event-timestamp-color: #acacac;
-
-$edit-button-url: "$(res)/img/icon_context_message.svg";
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
-
-// e2e
-$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
-$e2e-unverified-color: #e8bf37;
-$e2e-warning-color: #ba6363;
-
-/*** ImageView ***/
-$lightbox-bg-color: #454545;
-$lightbox-fg-color: #ffffff;
-$lightbox-border-color: #ffffff;
-
-$imagebody-giflabel: rgba(0, 0, 0, 0.7);
-$imagebody-giflabel-border: rgba(0, 0, 0, 0.2);
-$imagebody-giflabel-color: rgba(255, 255, 255, 1);
-
-// Tabbed views
-$tab-label-fg-color: #45474a;
-$tab-label-active-fg-color: #ffffff;
-$tab-label-bg-color: transparent;
-$tab-label-active-bg-color: #7ac9a1;
-$tab-label-icon-bg-color: #454545;
-$tab-label-active-icon-bg-color: #ffffff;
-
-// Buttons
-$button-primary-fg-color: #ffffff;
-$button-primary-bg-color: #7ac9a1;
-$button-primary-disabled-fg-color: #ffffff;
-$button-primary-disabled-bg-color: #bce4d0;
-$button-danger-fg-color: #ffffff;
-$button-danger-bg-color: #f56679;
-$button-danger-disabled-fg-color: #ffffff;
-$button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
-
-// Toggle switch
-$togglesw-off-color: #c1c9d6;
-$togglesw-on-color: #7ac9a1;
-$togglesw-ball-color: #fff;
-
-// unused?
-$progressbar-color: #000;
-
-$room-warning-bg-color: #fff8e3;
-
-$memberstatus-placeholder-color: $roomtile-name-color;
-
-$authpage-bg-color: #2e3649;
-$authpage-modal-bg-color: rgba(255, 255, 255, 0.59);
-$authpage-body-bg-color: #ffffff;
-$authpage-lang-color: #4e5054;
-$authpage-body-color: #61708b;
-
-// ***** Mixins! *****
-
-@define-mixin mx_DialogButton {
-    /* align images in buttons (eg spinners) */
-    vertical-align: middle;
-    border: 0px;
-    border-radius: 36px;
-    font-family: $font-family;
-    font-size: 14px;
-    color: $accent-fg-color;
-    background-color: $accent-color;
-    width: auto;
-    padding: 7px;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-    cursor: pointer;
-    display: inline-block;
-    outline: none;
-}
-
-@define-mixin mx_DialogButton_danger {
-    background-color: $warning-color;
-}
-
-@define-mixin mx_DialogButton_hover {
-}
-
-@define-mixin mx_DialogButton_small {
-    @mixin mx_DialogButton;
-    font-size: 15px;
-    padding: 0px 1.5em 0px 1.5em;
-}
-
-@define-mixin mx_DialogButton_secondary {
-    // flip colours for the secondary ones
-    font-weight: 600;
-    border: 1px solid $accent-color ! important;
-    color: $accent-color;
-    background-color: $accent-fg-color;
-}
diff --git a/res/themes/light/css/_fonts.scss b/res/themes/light/css/_fonts.scss
deleted file mode 100644
index c080663acf..0000000000
--- a/res/themes/light/css/_fonts.scss
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Open Sans
- * Includes extended Latin, Greek, Cyrillic and Vietnamese character sets
- */
-
-/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
- */
-@font-face {
-    font-family: 'Open Sans';
-    src: url('$(res)/fonts/Open_Sans/OpenSans-Regular.ttf') format('truetype');
-    font-weight: 400;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('$(res)/fonts/Open_Sans/OpenSans-Italic.ttf') format('truetype');
-    font-weight: 400;
-    font-style: italic;
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('$(res)/fonts/Open_Sans/OpenSans-Semibold.ttf') format('truetype');
-    font-weight: 600;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('$(res)/fonts/Open_Sans/OpenSans-SemiboldItalic.ttf') format('truetype');
-    font-weight: 600;
-    font-style: italic;
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('$(res)/fonts/Open_Sans/OpenSans-Bold.ttf') format('truetype');
-    font-weight: 700;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('$(res)/fonts/Open_Sans/OpenSans-BoldItalic.ttf') format('truetype');
-    font-weight: 700;
-    font-style: italic;
-}
-
-/*
- * Fira Mono
- * Used for monospace copy, i.e. code
- */
-
-@font-face {
-    font-family: 'Fira Mono';
-    src: url('$(res)/fonts/Fira_Mono/FiraMono-Regular.ttf') format('truetype');
-    font-weight: 400;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Fira Mono';
-    src: url('$(res)/fonts/Fira_Mono/FiraMono-Bold.ttf') format('truetype');
-    font-weight: 700;
-    font-style: normal;
-}
diff --git a/res/themes/light/css/light.scss b/res/themes/light/css/light.scss
deleted file mode 100644
index 6ac8d0feba..0000000000
--- a/res/themes/light/css/light.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "_paths.scss";
-@import "_fonts.scss";
-@import "_base.scss";
-@import "../../../../res/css/_components.scss";