From 395e827c136d5de06046e7461b26ee0854cef872 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 17:27:17 -0600 Subject: [PATCH 001/245] fix --- files/templates/CHRISTMAS/default.html | 4 ++-- files/templates/CHRISTMAS/settings.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index 85f0b9149..ead4524b9 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -217,8 +217,8 @@ - {% if v and (v.theme == 'theme-iron dark' or v.theme == 'theme-evergreen') %} - {% set theme = v.theme %} + {% if v and (v.theme2 == 'theme-iron dark' or v.theme2 == 'theme-evergreen') %} + {% set theme = v.theme2 %} {% else %} {% set theme = 'theme-iron dark' %} {% endif %} diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index a6be1cb67..19ea95b3d 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -57,8 +57,8 @@ - {% if v and (v.theme == 'theme-iron dark' or v.theme == 'theme-evergreen') %} - {% set theme = v.theme %} + {% if v and (v.theme2 == 'theme-iron dark' or v.theme2 == 'theme-evergreen') %} + {% set theme = v.them2e %} {% else %} {% set theme = 'theme-iron dark' %} {% endif %} From 1af4e928660c8bf1abe0231a6bc57472fbb0d931 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 17:30:29 -0600 Subject: [PATCH 002/245] fix --- files/templates/CHRISTMAS/login.html | 2 +- files/templates/CHRISTMAS/sign_up.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/login.html b/files/templates/CHRISTMAS/login.html index 7ce58f56b..70c7ac604 100644 --- a/files/templates/CHRISTMAS/login.html +++ b/files/templates/CHRISTMAS/login.html @@ -24,7 +24,7 @@ - +
diff --git a/files/templates/CHRISTMAS/sign_up.html b/files/templates/CHRISTMAS/sign_up.html index a74dd6ee7..37464a12a 100644 --- a/files/templates/CHRISTMAS/sign_up.html +++ b/files/templates/CHRISTMAS/sign_up.html @@ -36,7 +36,7 @@ - +
From d4fbf8c422d9932d0ab56738647ff60f222b0ca0 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 17:35:35 -0600 Subject: [PATCH 003/245] fix --- files/templates/CHRISTMAS/default.html | 2 +- files/templates/CHRISTMAS/settings.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index ead4524b9..e2336bf4e 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -348,7 +348,7 @@ - + - {% if v and v.theme2 %} +{% if v and v.theme2 %} {% set theme = v.theme2 %} {% else %} {% set theme = 'theme-iron dark' %} {% endif %} - + {% include "CHRISTMAS/header-tw.html" %} -
+
-
+

@@ -119,7 +119,7 @@

-
+
{% if error %} From b2b6c63b15026c86d42d0b5415c690c931aed8e2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 15:35:02 -0600 Subject: [PATCH 134/245] fix --- .../CHRISTMAS/comments/CommentMessageReplyForm.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/comments/CommentMessageReplyForm.html b/files/templates/CHRISTMAS/comments/CommentMessageReplyForm.html index 6f388d22c..290436061 100644 --- a/files/templates/CHRISTMAS/comments/CommentMessageReplyForm.html +++ b/files/templates/CHRISTMAS/comments/CommentMessageReplyForm.html @@ -2,9 +2,9 @@ From 0701829feb60bcf43b90bea46d97dd0933793df7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:11:54 -0600 Subject: [PATCH 149/245] fix --- files/static/dist/main.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 0aee9423c..9e12b7ab5 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -1847,6 +1847,14 @@ video { --tw-bg-opacity: 1; background-color: rgba(0, 0, 0, var(--tw-bg-opacity)); } +.bg-\[\#374151\] { + --tw-bg-opacity: 1; + background-color: rgba(55, 65, 81, var(--tw-bg-opacity)); +} +.bg-\[\#1f2937\] { + --tw-bg-opacity: 1; + background-color: rgba(31, 41, 55, var(--tw-bg-opacity)); +} .bg-gray-300\/40 { background-color: rgba(var(--color-300), 0.4); } From b25d857cfd48ea81fce7025e9cadaf845a316225 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:12:37 -0600 Subject: [PATCH 150/245] fix --- files/templates/CHRISTMAS/modals/ModalThemePicker.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/modals/ModalThemePicker.html b/files/templates/CHRISTMAS/modals/ModalThemePicker.html index 72163ae06..25c17f72f 100644 --- a/files/templates/CHRISTMAS/modals/ModalThemePicker.html +++ b/files/templates/CHRISTMAS/modals/ModalThemePicker.html @@ -407,7 +407,7 @@
-
    +
    • From 9e623f0b0a791b5392fd5afa46ebb4b4927d5a3f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:21:53 -0600 Subject: [PATCH 151/245] fix --- files/static/dist/main.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 9e12b7ab5..07fd6c428 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2495,6 +2495,19 @@ video { --color-900: 0,0,0; } +.theme-cambridge { + --color-primary: 185,28,28; + --color-100: 245,245,245; + --color-200: 229,229,229; + --color-300: 212,212,212; + --color-400: 163,163,163; + --color-500: 115,115,115; + --color-600: 82,82,82; + --color-700: 64,64,64; + --color-800: 38,38,38; + --color-900: 23,23,23; +} + .theme-midnight { --color-primary: 219,39,119; --color-100: 243,244,246; From 6ef43f328db6e4c459934ff972c567c6f83003ea Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:22:36 -0600 Subject: [PATCH 152/245] fixfix --- files/static/dist/main.css | 13 ------------- files/static/src/main.css | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 07fd6c428..9e12b7ab5 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2495,19 +2495,6 @@ video { --color-900: 0,0,0; } -.theme-cambridge { - --color-primary: 185,28,28; - --color-100: 245,245,245; - --color-200: 229,229,229; - --color-300: 212,212,212; - --color-400: 163,163,163; - --color-500: 115,115,115; - --color-600: 82,82,82; - --color-700: 64,64,64; - --color-800: 38,38,38; - --color-900: 23,23,23; -} - .theme-midnight { --color-primary: 219,39,119; --color-100: 243,244,246; diff --git a/files/static/src/main.css b/files/static/src/main.css index 0440065cd..c70bd85e3 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -28,6 +28,19 @@ --color-900: 12, 47, 60; } +.theme-cambridge { + --color-primary: 185,28,28; + --color-100: 245,245,245; + --color-200: 229,229,229; + --color-300: 212,212,212; + --color-400: 163,163,163; + --color-500: 115,115,115; + --color-600: 82,82,82; + --color-700: 64,64,64; + --color-800: 38,38,38; + --color-900: 23,23,23; +} + .theme-limon { --color-primary: 202,138,4; --color-100: 236,252,203; From 605a1ca139946e56e84f9cbb13e8766c7382e4aa Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:22:55 -0600 Subject: [PATCH 153/245] fix --- files/static/dist/main.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 9e12b7ab5..dbaf5fb03 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2430,6 +2430,19 @@ video { --color-900: 12, 47, 60; } +.theme-cambridge { + --color-primary: 185,28,28; + --color-100: 245,245,245; + --color-200: 229,229,229; + --color-300: 212,212,212; + --color-400: 163,163,163; + --color-500: 115,115,115; + --color-600: 82,82,82; + --color-700: 64,64,64; + --color-800: 38,38,38; + --color-900: 23,23,23; +} + .theme-limon { --color-primary: 202,138,4; --color-100: 236,252,203; From f36377c848a9b53cc08922d862bfac0dbb4dfe06 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:25:17 -0600 Subject: [PATCH 154/245] fix --- files/static/src/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/static/src/main.css b/files/static/src/main.css index c70bd85e3..91290a02c 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -29,7 +29,7 @@ } .theme-cambridge { - --color-primary: 185,28,28; + --color-primary: 153,27,27; --color-100: 245,245,245; --color-200: 229,229,229; --color-300: 212,212,212; From 5069bd2dbc5b906cc91d1070b31ecc0648dc1dd3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:25:34 -0600 Subject: [PATCH 155/245] fix --- files/static/src/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/static/src/main.css b/files/static/src/main.css index 91290a02c..4aaa5fb49 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -37,8 +37,8 @@ --color-500: 115,115,115; --color-600: 82,82,82; --color-700: 64,64,64; - --color-800: 38,38,38; - --color-900: 23,23,23; + --color-800: 153,27,27; + --color-900: 127,29,29; } .theme-limon { From 983ef0494638df5f49d6382ba57ab35c789ee4c7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:25:48 -0600 Subject: [PATCH 156/245] fix --- files/static/dist/main.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index dbaf5fb03..5d71060e0 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2431,7 +2431,7 @@ video { } .theme-cambridge { - --color-primary: 185,28,28; + --color-primary: 153,27,27; --color-100: 245,245,245; --color-200: 229,229,229; --color-300: 212,212,212; @@ -2439,8 +2439,8 @@ video { --color-500: 115,115,115; --color-600: 82,82,82; --color-700: 64,64,64; - --color-800: 38,38,38; - --color-900: 23,23,23; + --color-800: 153,27,27; + --color-900: 127,29,29; } .theme-limon { From 78cbe494ba4c4865154225fe2950e8db96737fa8 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:28:42 -0600 Subject: [PATCH 157/245] fix --- files/static/dist/main.css | 18 +++++++++--------- files/static/src/main.css | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 5d71060e0..69d79bf16 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2432,15 +2432,15 @@ video { .theme-cambridge { --color-primary: 153,27,27; - --color-100: 245,245,245; - --color-200: 229,229,229; - --color-300: 212,212,212; - --color-400: 163,163,163; - --color-500: 115,115,115; - --color-600: 82,82,82; - --color-700: 64,64,64; - --color-800: 153,27,27; - --color-900: 127,29,29; + --color-100: 231,229,228; + --color-200: 231,229,228; + --color-300: 214,211,209; + --color-400: 168,162,158; + --color-500: 120,113,108; + --color-600: 87,83,78; + --color-700: 68,64,60; + --color-800: 41,37,36; + --color-900: 28,25,23; } .theme-limon { diff --git a/files/static/src/main.css b/files/static/src/main.css index 4aaa5fb49..0731163b6 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -30,15 +30,15 @@ .theme-cambridge { --color-primary: 153,27,27; - --color-100: 245,245,245; - --color-200: 229,229,229; - --color-300: 212,212,212; - --color-400: 163,163,163; - --color-500: 115,115,115; - --color-600: 82,82,82; - --color-700: 64,64,64; - --color-800: 153,27,27; - --color-900: 127,29,29; + --color-100: 231,229,228; + --color-200: 231,229,228; + --color-300: 214,211,209; + --color-400: 168,162,158; + --color-500: 120,113,108; + --color-600: 87,83,78; + --color-700: 68,64,60; + --color-800: 41,37,36; + --color-900: 28,25,23; } .theme-limon { From 29610b6f8813257f961d73edb3023ce5a14fe1e4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:31:43 -0600 Subject: [PATCH 158/245] fix --- .../CHRISTMAS/modals/ModalThemePicker.html | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/files/templates/CHRISTMAS/modals/ModalThemePicker.html b/files/templates/CHRISTMAS/modals/ModalThemePicker.html index 25c17f72f..bb82f1e17 100644 --- a/files/templates/CHRISTMAS/modals/ModalThemePicker.html +++ b/files/templates/CHRISTMAS/modals/ModalThemePicker.html @@ -430,6 +430,36 @@
+ +
+ + +
From 68007fe9b455e87e39f4f6eae734db2cb66c3f19 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:31:52 -0600 Subject: [PATCH 159/245] fix --- files/static/dist/main.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 69d79bf16..db56af9f4 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -1855,6 +1855,18 @@ video { --tw-bg-opacity: 1; background-color: rgba(31, 41, 55, var(--tw-bg-opacity)); } +.bg-\[\#44403c\] { + --tw-bg-opacity: 1; + background-color: rgba(68, 64, 60, var(--tw-bg-opacity)); +} +.bg-\[\#d6d3d1\] { + --tw-bg-opacity: 1; + background-color: rgba(214, 211, 209, var(--tw-bg-opacity)); +} +.bg-\[\#991b1b\] { + --tw-bg-opacity: 1; + background-color: rgba(153, 27, 27, var(--tw-bg-opacity)); +} .bg-gray-300\/40 { background-color: rgba(var(--color-300), 0.4); } @@ -2321,6 +2333,10 @@ video { --tw-text-opacity: 1; color: rgba(234, 179, 8, var(--tw-text-opacity)); } +.text-\[\#991b1b\] { + --tw-text-opacity: 1; + color: rgba(153, 27, 27, var(--tw-text-opacity)); +} .antialiased { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; From 54e85b562578290413e44a85a8f383ef8e9866a8 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 20 Dec 2021 17:32:36 -0600 Subject: [PATCH 160/245] fix --- files/templates/CHRISTMAS/modals/ModalThemePicker.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/modals/ModalThemePicker.html b/files/templates/CHRISTMAS/modals/ModalThemePicker.html index bb82f1e17..080cece51 100644 --- a/files/templates/CHRISTMAS/modals/ModalThemePicker.html +++ b/files/templates/CHRISTMAS/modals/ModalThemePicker.html @@ -432,8 +432,8 @@
- -