From cf31b64c8d4faa07dfe2763cf5c1114dd0b85be3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Fri, 17 Dec 2021 21:06:59 -0600 Subject: [PATCH 001/195] new grays --- tailwind.config.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index 4416093e1..653e520b8 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -48,14 +48,14 @@ module.exports = { colors: { gray: { '100': '#f4f6f4', - '200': '#e5ebe7', - '300': '#d1dbd5', - '400': '#9bafa1', - '500': '#6a8073', - '600': '#4c6351', - '700': '#37523e', - '800': '#1f3726', - '900': '#112817' + '200': '#e5e7eb', + '300': '#d1d7db', + '400': '#9ba6af', + '500': '#6a7680', + '600': '#4d5b63', + '700': '#374552', + '800': '#1f2c37', + '900': '#111c28' }, } }, From 5f865c42d9101fd18e4b3db53e86d570aa019515 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 17:32:35 -0600 Subject: [PATCH 002/195] theming --- files/static/dist/main.css | 260 +++++++++++++++++++++---------------- files/static/src/main.css | 36 +++++ tailwind.config.js | 96 ++++++++++++-- 3 files changed, 269 insertions(+), 123 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 7718e55ba..9fff2e7a9 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -430,18 +430,18 @@ textarea { input::-moz-placeholder, textarea::-moz-placeholder { opacity: 1; - color: #9bafa1; + color: rgb(var(--color-400)); } input:-ms-input-placeholder, textarea:-ms-input-placeholder { opacity: 1; - color: #9bafa1; + color: rgb(var(--color-400)); } input::placeholder, textarea::placeholder { opacity: 1; - color: #9bafa1; + color: rgb(var(--color-400)); } button, @@ -576,8 +576,7 @@ video { --tw-scale-x: 1; --tw-scale-y: 1; --tw-transform: translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); - --tw-border-opacity: 1; - border-color: rgba(229, 235, 231, var(--tw-border-opacity)); + border-color: rgb(var(--color-200)); --tw-ring-offset-shadow: 0 0 #0000; --tw-ring-shadow: 0 0 #0000; --tw-shadow: 0 0 #0000; @@ -721,7 +720,7 @@ video { font-weight: 700; line-height: 1.5; --tw-text-opacity: 1; - color: rgba(55, 82, 62, var(--tw-text-opacity)); + color: rgba(var(--color-700), var(--tw-text-opacity)); } .container { width: 100%; @@ -1408,22 +1407,22 @@ video { } .divide-gray-900 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; - border-color: rgba(17, 40, 23, var(--tw-divide-opacity)); + border-color: rgba(var(--color-900), var(--tw-divide-opacity)); } .divide-gray-400 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; - border-color: rgba(155, 175, 161, var(--tw-divide-opacity)); + border-color: rgba(var(--color-400), var(--tw-divide-opacity)); } .divide-gray-300 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; - border-color: rgba(209, 219, 213, var(--tw-divide-opacity)); + border-color: rgba(var(--color-300), var(--tw-divide-opacity)); } .divide-red-300 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; border-color: rgba(252, 165, 165, var(--tw-divide-opacity)); } .divide-gray-400\/30 > :not([hidden]) ~ :not([hidden]) { - border-color: rgba(155, 175, 161, 0.3); + border-color: rgba(var(--color-400), 0.3); } .overflow-auto { overflow: auto; @@ -1520,23 +1519,23 @@ video { } .border-gray-300 { --tw-border-opacity: 1; - border-color: rgba(209, 219, 213, var(--tw-border-opacity)); + border-color: rgba(var(--color-300), var(--tw-border-opacity)); } .border-gray-400 { --tw-border-opacity: 1; - border-color: rgba(155, 175, 161, var(--tw-border-opacity)); + border-color: rgba(var(--color-400), var(--tw-border-opacity)); } .border-gray-900 { --tw-border-opacity: 1; - border-color: rgba(17, 40, 23, var(--tw-border-opacity)); + border-color: rgba(var(--color-900), var(--tw-border-opacity)); } .border-gray-800 { --tw-border-opacity: 1; - border-color: rgba(31, 55, 38, var(--tw-border-opacity)); + border-color: rgba(var(--color-800), var(--tw-border-opacity)); } .border-gray-700 { --tw-border-opacity: 1; - border-color: rgba(55, 82, 62, var(--tw-border-opacity)); + border-color: rgba(var(--color-700), var(--tw-border-opacity)); } .border-red-900 { --tw-border-opacity: 1; @@ -1556,7 +1555,7 @@ video { } .border-gray-500 { --tw-border-opacity: 1; - border-color: rgba(106, 128, 115, var(--tw-border-opacity)); + border-color: rgba(var(--color-500), var(--tw-border-opacity)); } .border-black { --tw-border-opacity: 1; @@ -1574,7 +1573,7 @@ video { } .bg-gray-100 { --tw-bg-opacity: 1; - background-color: rgba(244, 246, 244, var(--tw-bg-opacity)); + background-color: rgba(var(--color-100), var(--tw-bg-opacity)); } .bg-white { --tw-bg-opacity: 1; @@ -1582,23 +1581,23 @@ video { } .bg-gray-500 { --tw-bg-opacity: 1; - background-color: rgba(106, 128, 115, var(--tw-bg-opacity)); + background-color: rgba(var(--color-500), var(--tw-bg-opacity)); } .bg-gray-700 { --tw-bg-opacity: 1; - background-color: rgba(55, 82, 62, var(--tw-bg-opacity)); + background-color: rgba(var(--color-700), var(--tw-bg-opacity)); } .bg-gray-300 { --tw-bg-opacity: 1; - background-color: rgba(209, 219, 213, var(--tw-bg-opacity)); + background-color: rgba(var(--color-300), var(--tw-bg-opacity)); } .bg-gray-800 { --tw-bg-opacity: 1; - background-color: rgba(31, 55, 38, var(--tw-bg-opacity)); + background-color: rgba(var(--color-800), var(--tw-bg-opacity)); } .bg-gray-900 { --tw-bg-opacity: 1; - background-color: rgba(17, 40, 23, var(--tw-bg-opacity)); + background-color: rgba(var(--color-900), var(--tw-bg-opacity)); } .bg-black\/20 { background-color: rgba(0, 0, 0, 0.2); @@ -1609,10 +1608,10 @@ video { } .bg-gray-200 { --tw-bg-opacity: 1; - background-color: rgba(229, 235, 231, var(--tw-bg-opacity)); + background-color: rgba(var(--color-200), var(--tw-bg-opacity)); } .bg-gray-300\/50 { - background-color: rgba(209, 219, 213, 0.5); + background-color: rgba(var(--color-300), 0.5); } .bg-red-800 { --tw-bg-opacity: 1; @@ -1648,13 +1647,13 @@ video { } .bg-gray-400 { --tw-bg-opacity: 1; - background-color: rgba(155, 175, 161, var(--tw-bg-opacity)); + background-color: rgba(var(--color-400), var(--tw-bg-opacity)); } .bg-white\/60 { background-color: rgba(255, 255, 255, 0.6); } .bg-gray-300\/40 { - background-color: rgba(209, 219, 213, 0.4); + background-color: rgba(var(--color-300), 0.4); } .bg-green-500 { --tw-bg-opacity: 1; @@ -1678,20 +1677,20 @@ video { --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(254, 202, 202, 0)); } .from-gray-300 { - --tw-gradient-from: #d1dbd5; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(209, 219, 213, 0)); + --tw-gradient-from: rgb(var(--color-300)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-300), 0)); } .from-gray-200 { - --tw-gradient-from: #e5ebe7; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(229, 235, 231, 0)); + --tw-gradient-from: rgb(var(--color-200)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-200), 0)); } .from-gray-500 { - --tw-gradient-from: #6a8073; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(106, 128, 115, 0)); + --tw-gradient-from: rgb(var(--color-500)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-500), 0)); } .from-gray-800 { - --tw-gradient-from: #1f3726; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(31, 55, 38, 0)); + --tw-gradient-from: rgb(var(--color-800)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-800), 0)); } .from-red-700 { --tw-gradient-from: #b91c1c; @@ -1710,16 +1709,16 @@ video { --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(153, 27, 27, 0)); } .to-gray-200 { - --tw-gradient-to: #e5ebe7; + --tw-gradient-to: rgb(var(--color-200)); } .to-gray-100 { - --tw-gradient-to: #f4f6f4; + --tw-gradient-to: rgb(var(--color-100)); } .to-gray-400 { - --tw-gradient-to: #9bafa1; + --tw-gradient-to: rgb(var(--color-400)); } .to-gray-700 { - --tw-gradient-to: #37523e; + --tw-gradient-to: rgb(var(--color-700)); } .to-red-600 { --tw-gradient-to: #dc2626; @@ -1786,9 +1785,9 @@ video { padding-left: 0.25rem; padding-right: 0.25rem; } -.px-2 { - padding-left: 0.5rem; - padding-right: 0.5rem; +.py-0 { + padding-top: 0px; + padding-bottom: 0px; } .py-4 { padding-top: 1rem; @@ -1802,9 +1801,9 @@ video { padding-top: 0.5rem; padding-bottom: 0.5rem; } -.py-0 { - padding-top: 0px; - padding-bottom: 0px; +.px-2 { + padding-left: 0.5rem; + padding-right: 0.5rem; } .px-0 { padding-left: 0px; @@ -1869,18 +1868,15 @@ video { .pl-0 { padding-left: 0px; } -.pr-1 { - padding-right: 0.25rem; -} -.pl-1 { - padding-left: 0.25rem; -} -.pl-2 { - padding-left: 0.5rem; +.pt-1 { + padding-top: 0.25rem; } .pr-2 { padding-right: 0.5rem; } +.pl-2 { + padding-left: 0.5rem; +} .pr-0 { padding-right: 0px; } @@ -1890,12 +1886,18 @@ video { .pl-3 { padding-left: 0.75rem; } +.pl-1 { + padding-left: 0.25rem; +} .pb-1 { padding-bottom: 0.25rem; } .pt-0 { padding-top: 0px; } +.pr-1 { + padding-right: 0.25rem; +} .pt-16 { padding-top: 4rem; } @@ -2000,19 +2002,19 @@ video { } .text-gray-500 { --tw-text-opacity: 1; - color: rgba(106, 128, 115, var(--tw-text-opacity)); + color: rgba(var(--color-500), var(--tw-text-opacity)); } .text-gray-400 { --tw-text-opacity: 1; - color: rgba(155, 175, 161, var(--tw-text-opacity)); + color: rgba(var(--color-400), var(--tw-text-opacity)); } .text-gray-600 { --tw-text-opacity: 1; - color: rgba(76, 99, 81, var(--tw-text-opacity)); + color: rgba(var(--color-600), var(--tw-text-opacity)); } .text-gray-700 { --tw-text-opacity: 1; - color: rgba(55, 82, 62, var(--tw-text-opacity)); + color: rgba(var(--color-700), var(--tw-text-opacity)); } .text-red-600 { --tw-text-opacity: 1; @@ -2020,19 +2022,19 @@ video { } .text-gray-900 { --tw-text-opacity: 1; - color: rgba(17, 40, 23, var(--tw-text-opacity)); + color: rgba(var(--color-900), var(--tw-text-opacity)); } .text-gray-200 { --tw-text-opacity: 1; - color: rgba(229, 235, 231, var(--tw-text-opacity)); + color: rgba(var(--color-200), var(--tw-text-opacity)); } .text-gray-100 { --tw-text-opacity: 1; - color: rgba(244, 246, 244, var(--tw-text-opacity)); + color: rgba(var(--color-100), var(--tw-text-opacity)); } .text-gray-300 { --tw-text-opacity: 1; - color: rgba(209, 219, 213, var(--tw-text-opacity)); + color: rgba(var(--color-300), var(--tw-text-opacity)); } .text-yellow-500 { --tw-text-opacity: 1; @@ -2161,6 +2163,42 @@ video { scrollbar-width: none; /* Firefox */ } +.theme-midnight { + --color-100: 244,244,245; + --color-200: 228,228,231; + --color-300: 212,212,216; + --color-400: 161,161,170; + --color-500: 113,113,122; + --color-600: 82,82,91; + --color-700: 63,63,70; + --color-800: 39,39,42; + --color-900: 24,24,27; +} + +.theme-canary { + --color-100: 252,231,243; + --color-200: 251,207,232; + --color-300: 249,168,212; + --color-400: 244,114,182; + --color-500: 236,72,153; + --color-600: 219,39,119; + --color-700: 190,24,93; + --color-800: 157,23,77; + --color-900: 131,24,67; +} + +.theme-evergreen { + --color-100: 41, 89, 57; + --color-200: 233, 176, 223; + --color-300: 173, 238, 207; + --color-400: 232, 239, 235; + --color-500: 232, 239, 235; + --color-600: 232, 239, 235; + --color-700: 232, 239, 235; + --color-800: 232, 239, 235; + --color-900: 232, 239, 235; +} + /* ----------------------- VARIABLES --------------------- */ :root { --color-primary: 220, 38, 38; @@ -2180,7 +2218,7 @@ video { border-radius: 0.25rem; border-width: 1px; --tw-border-opacity: 1; - border-color: rgba(209, 219, 213, var(--tw-border-opacity)); + border-color: rgba(var(--color-300), var(--tw-border-opacity)); --tw-bg-opacity: 1; background-color: rgba(255, 255, 255, var(--tw-bg-opacity)); padding: 0.5rem; @@ -2191,7 +2229,7 @@ video { } .form-input:hover { --tw-border-opacity: 1; - border-color: rgba(155, 175, 161, var(--tw-border-opacity)); + border-color: rgba(var(--color-400), var(--tw-border-opacity)); } .form-input:focus { --tw-border-opacity: 1; @@ -2246,7 +2284,7 @@ video { --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(185, 28, 28, 0)); --tw-gradient-to: #dc2626; --tw-text-opacity: 1; - color: rgba(244, 246, 244, var(--tw-text-opacity)); + color: rgba(var(--color-100), var(--tw-text-opacity)); } .btn-red:hover { --tw-gradient-from: #dc2626; @@ -2265,7 +2303,7 @@ video { --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(21, 128, 61, 0)); --tw-gradient-to: #16a34a; --tw-text-opacity: 1; - color: rgba(244, 246, 244, var(--tw-text-opacity)); + color: rgba(var(--color-100), var(--tw-text-opacity)); } .btn-green:hover { --tw-gradient-from: #16a34a; @@ -2274,26 +2312,26 @@ video { } .btn-green:focus { --tw-text-opacity: 1; - color: rgba(229, 235, 231, var(--tw-text-opacity)); + color: rgba(var(--color-200), var(--tw-text-opacity)); } .btn-gray { --tw-border-opacity: 1; - border-color: rgba(209, 219, 213, var(--tw-border-opacity)); + border-color: rgba(var(--color-300), var(--tw-border-opacity)); background-image: linear-gradient(to top, var(--tw-gradient-stops)); - --tw-gradient-from: #e5ebe7; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(229, 235, 231, 0)); - --tw-gradient-to: #f4f6f4; + --tw-gradient-from: rgb(var(--color-200)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-200), 0)); + --tw-gradient-to: rgb(var(--color-100)); --tw-text-opacity: 1; - color: rgba(55, 82, 62, var(--tw-text-opacity)); + color: rgba(var(--color-700), var(--tw-text-opacity)); } .btn-gray:hover { - --tw-gradient-from: #f4f6f4; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(244, 246, 244, 0)); - --tw-gradient-to: #e5ebe7; + --tw-gradient-from: rgb(var(--color-100)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-100), 0)); + --tw-gradient-to: rgb(var(--color-200)); } .btn-gray:focus { --tw-text-opacity: 1; - color: rgba(17, 40, 23, var(--tw-text-opacity)); + color: rgba(var(--color-900), var(--tw-text-opacity)); } /* ----------------------- BADGES ----------------------- */ @@ -2382,19 +2420,19 @@ img.emoji-md { object-fit: contain} img.emoji-lg { - max-width: 10rem; + max-width: 100%; display: inline-block; -o-object-fit: contain; object-fit: contain} .odd\:bg-gray-200:nth-child(odd) { --tw-bg-opacity: 1; - background-color: rgba(229, 235, 231, var(--tw-bg-opacity)); + background-color: rgba(var(--color-200), var(--tw-bg-opacity)); } .visited\:text-gray-700:visited { --tw-text-opacity: 1; - color: rgba(55, 82, 62, var(--tw-text-opacity)); + color: rgba(var(--color-700), var(--tw-text-opacity)); } .hover\:scale-\[1\.15\]:hover { @@ -2405,22 +2443,22 @@ img.emoji-lg { .hover\:border-gray-400:hover { --tw-border-opacity: 1; - border-color: rgba(155, 175, 161, var(--tw-border-opacity)); + border-color: rgba(var(--color-400), var(--tw-border-opacity)); } .hover\:border-gray-500:hover { --tw-border-opacity: 1; - border-color: rgba(106, 128, 115, var(--tw-border-opacity)); + border-color: rgba(var(--color-500), var(--tw-border-opacity)); } .hover\:bg-gray-300:hover { --tw-bg-opacity: 1; - background-color: rgba(209, 219, 213, var(--tw-bg-opacity)); + background-color: rgba(var(--color-300), var(--tw-bg-opacity)); } .hover\:bg-gray-700:hover { --tw-bg-opacity: 1; - background-color: rgba(55, 82, 62, var(--tw-bg-opacity)); + background-color: rgba(var(--color-700), var(--tw-bg-opacity)); } .hover\:bg-black\/30:hover { @@ -2429,7 +2467,7 @@ img.emoji-lg { .hover\:bg-gray-400:hover { --tw-bg-opacity: 1; - background-color: rgba(155, 175, 161, var(--tw-bg-opacity)); + background-color: rgba(var(--color-400), var(--tw-bg-opacity)); } .hover\:bg-gradient-to-t:hover { @@ -2437,8 +2475,8 @@ img.emoji-lg { } .hover\:from-gray-100:hover { - --tw-gradient-from: #f4f6f4; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(244, 246, 244, 0)); + --tw-gradient-from: rgb(var(--color-100)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-100), 0)); } .hover\:from-red-600:hover { @@ -2477,7 +2515,7 @@ img.emoji-lg { } .hover\:to-gray-200:hover { - --tw-gradient-to: #e5ebe7; + --tw-gradient-to: rgb(var(--color-200)); } .hover\:to-red-700:hover { @@ -2507,27 +2545,27 @@ img.emoji-lg { .hover\:text-gray-900:hover { --tw-text-opacity: 1; - color: rgba(17, 40, 23, var(--tw-text-opacity)); + color: rgba(var(--color-900), var(--tw-text-opacity)); } .hover\:text-gray-700:hover { --tw-text-opacity: 1; - color: rgba(55, 82, 62, var(--tw-text-opacity)); + color: rgba(var(--color-700), var(--tw-text-opacity)); } .hover\:text-gray-400:hover { --tw-text-opacity: 1; - color: rgba(155, 175, 161, var(--tw-text-opacity)); + color: rgba(var(--color-400), var(--tw-text-opacity)); } .hover\:text-gray-300:hover { --tw-text-opacity: 1; - color: rgba(209, 219, 213, var(--tw-text-opacity)); + color: rgba(var(--color-300), var(--tw-text-opacity)); } .hover\:text-gray-200:hover { --tw-text-opacity: 1; - color: rgba(229, 235, 231, var(--tw-text-opacity)); + color: rgba(var(--color-200), var(--tw-text-opacity)); } .hover\:text-white:hover { @@ -2542,12 +2580,12 @@ img.emoji-lg { .hover\:text-gray-500:hover { --tw-text-opacity: 1; - color: rgba(106, 128, 115, var(--tw-text-opacity)); + color: rgba(var(--color-500), var(--tw-text-opacity)); } .hover\:text-gray-600:hover { --tw-text-opacity: 1; - color: rgba(76, 99, 81, var(--tw-text-opacity)); + color: rgba(var(--color-600), var(--tw-text-opacity)); } .hover\:text-blue-600:hover { @@ -2572,7 +2610,7 @@ img.emoji-lg { .hover\:text-gray-800:hover { --tw-text-opacity: 1; - color: rgba(31, 55, 38, var(--tw-text-opacity)); + color: rgba(var(--color-800), var(--tw-text-opacity)); } .hover\:text-red-500:hover { @@ -2608,8 +2646,8 @@ img.emoji-lg { } .focus\:from-gray-700:focus { - --tw-gradient-from: #37523e; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(55, 82, 62, 0)); + --tw-gradient-from: rgb(var(--color-700)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-700), 0)); } .focus\:from-red-800:focus { @@ -2623,8 +2661,8 @@ img.emoji-lg { } .focus\:from-gray-100:focus { - --tw-gradient-from: #f4f6f4; - --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(244, 246, 244, 0)); + --tw-gradient-from: rgb(var(--color-100)); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(var(--color-100), 0)); } .focus\:from-green-800:focus { @@ -2633,7 +2671,7 @@ img.emoji-lg { } .focus\:to-gray-800:focus { - --tw-gradient-to: #1f3726; + --tw-gradient-to: rgb(var(--color-800)); } .focus\:to-red-700:focus { @@ -2645,7 +2683,7 @@ img.emoji-lg { } .focus\:to-gray-200:focus { - --tw-gradient-to: #e5ebe7; + --tw-gradient-to: rgb(var(--color-200)); } .focus\:to-green-700:focus { @@ -2663,17 +2701,17 @@ img.emoji-lg { .focus\:text-gray-900:focus { --tw-text-opacity: 1; - color: rgba(17, 40, 23, var(--tw-text-opacity)); + color: rgba(var(--color-900), var(--tw-text-opacity)); } .focus\:text-gray-500:focus { --tw-text-opacity: 1; - color: rgba(106, 128, 115, var(--tw-text-opacity)); + color: rgba(var(--color-500), var(--tw-text-opacity)); } .focus\:text-gray-400:focus { --tw-text-opacity: 1; - color: rgba(155, 175, 161, var(--tw-text-opacity)); + color: rgba(var(--color-400), var(--tw-text-opacity)); } .focus\:text-yellow-500:focus { @@ -2683,12 +2721,12 @@ img.emoji-lg { .focus\:text-gray-300:focus { --tw-text-opacity: 1; - color: rgba(209, 219, 213, var(--tw-text-opacity)); + color: rgba(var(--color-300), var(--tw-text-opacity)); } .focus\:text-gray-200:focus { --tw-text-opacity: 1; - color: rgba(229, 235, 231, var(--tw-text-opacity)); + color: rgba(var(--color-200), var(--tw-text-opacity)); } .focus\:shadow-inner:focus { @@ -2736,7 +2774,7 @@ img.emoji-lg { } .focus\:ring-offset-gray-800:focus { - --tw-ring-offset-color: #1f3726; + --tw-ring-offset-color: rgb(var(--color-800)); } .focus\:text-shadow:focus { @@ -2745,7 +2783,7 @@ img.emoji-lg { .active\:text-gray-800:active { --tw-text-opacity: 1; - color: rgba(31, 55, 38, var(--tw-text-opacity)); + color: rgba(var(--color-800), var(--tw-text-opacity)); } .active\:shadow-inner:active { @@ -2760,7 +2798,7 @@ img.emoji-lg { .peer:checked ~ .peer-checked\:bg-gray-400 { --tw-bg-opacity: 1; - background-color: rgba(155, 175, 161, var(--tw-bg-opacity)); + background-color: rgba(var(--color-400), var(--tw-bg-opacity)); } .peer:checked ~ .peer-checked\:shadow-inner { @@ -2975,12 +3013,12 @@ img.emoji-lg { .md\:divide-gray-700 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; - border-color: rgba(55, 82, 62, var(--tw-divide-opacity)); + border-color: rgba(var(--color-700), var(--tw-divide-opacity)); } .md\:divide-gray-300 > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; - border-color: rgba(209, 219, 213, var(--tw-divide-opacity)); + border-color: rgba(var(--color-300), var(--tw-divide-opacity)); } .md\:border-t { @@ -2993,12 +3031,12 @@ img.emoji-lg { .md\:border-gray-300 { --tw-border-opacity: 1; - border-color: rgba(209, 219, 213, var(--tw-border-opacity)); + border-color: rgba(var(--color-300), var(--tw-border-opacity)); } .md\:bg-gray-200 { --tw-bg-opacity: 1; - background-color: rgba(229, 235, 231, var(--tw-bg-opacity)); + background-color: rgba(var(--color-200), var(--tw-bg-opacity)); } .md\:bg-transparent { diff --git a/files/static/src/main.css b/files/static/src/main.css index 29a3eea52..0d9428ac8 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -2,6 +2,42 @@ @tailwind components; @tailwind utilities; +.theme-midnight { + --color-100: 244,244,245; + --color-200: 228,228,231; + --color-300: 212,212,216; + --color-400: 161,161,170; + --color-500: 113,113,122; + --color-600: 82,82,91; + --color-700: 63,63,70; + --color-800: 39,39,42; + --color-900: 24,24,27; +} + +.theme-canary { + --color-100: 252,231,243; + --color-200: 251,207,232; + --color-300: 249,168,212; + --color-400: 244,114,182; + --color-500: 236,72,153; + --color-600: 219,39,119; + --color-700: 190,24,93; + --color-800: 157,23,77; + --color-900: 131,24,67; +} + +.theme-evergreen { + --color-100: 41, 89, 57; + --color-200: 233, 176, 223; + --color-300: 173, 238, 207; + --color-400: 232, 239, 235; + --color-500: 232, 239, 235; + --color-600: 232, 239, 235; + --color-700: 232, 239, 235; + --color-800: 232, 239, 235; + --color-900: 232, 239, 235; +} + /* ----------------------- VARIABLES --------------------- */ :root { --color-primary: 220, 38, 38; diff --git a/tailwind.config.js b/tailwind.config.js index 653e520b8..dd7e82d89 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,8 +3,8 @@ const colors = require('tailwindcss/colors') module.exports = { mode: 'jit', purge: [ - 'files/templates/**/*.html', - 'files/templates/*.html' + 'files/templates/**/*.html', + 'files/templates/*.html' ], darkMode: 'class', // or 'media' or 'class' theme: { @@ -47,16 +47,88 @@ module.exports = { }, colors: { gray: { - '100': '#f4f6f4', - '200': '#e5e7eb', - '300': '#d1d7db', - '400': '#9ba6af', - '500': '#6a7680', - '600': '#4d5b63', - '700': '#374552', - '800': '#1f2c37', - '900': '#111c28' - }, + 100: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-100), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-100), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-100))`; + }, + 200: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-200), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-200), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-200))`; + }, + 300: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-300), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-300), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-300))`; + }, + 400: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-400), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-400), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-400))`; + }, + 500: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-500), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-500), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-500))`; + }, + 600: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-600), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-600), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-600))`; + }, + 700: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-700), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-700), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-700))`; + }, + 800: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-800), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-800), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-800))`; + }, + 900: ({ opacityVariable, opacityValue }) => { + if (opacityValue !== undefined) { + return `rgba(var(--color-900), ${opacityValue})`; + } + if (opacityVariable !== undefined) { + return `rgba(var(--color-900), var(${opacityVariable}, 1))`; + } + return `rgb(var(--color-900))`; + }, + } } }, }, From df6f144f9a5490b10ca5d0618978a2f81672ef30 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 17:43:51 -0600 Subject: [PATCH 003/195] fix --- files/static/dist/main.css | 18 +++++++++--------- files/static/src/main.css | 18 +++++++++--------- files/templates/CHRISTMAS/default.html | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 9fff2e7a9..6ba270480 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2188,15 +2188,15 @@ video { } .theme-evergreen { - --color-100: 41, 89, 57; - --color-200: 233, 176, 223; - --color-300: 173, 238, 207; - --color-400: 232, 239, 235; - --color-500: 232, 239, 235; - --color-600: 232, 239, 235; - --color-700: 232, 239, 235; - --color-800: 232, 239, 235; - --color-900: 232, 239, 235; + --color-100: 244,246,244; + --color-200: 229,235,231; + --color-300: 209,219,213; + --color-400: 155,175,161; + --color-500: 106,128,115; + --color-600: 76,99,81; + --color-700: 55,82,62; + --color-800: 31,55,38; + --color-900: 17,40,23; } /* ----------------------- VARIABLES --------------------- */ diff --git a/files/static/src/main.css b/files/static/src/main.css index 0d9428ac8..d9bafd832 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -27,15 +27,15 @@ } .theme-evergreen { - --color-100: 41, 89, 57; - --color-200: 233, 176, 223; - --color-300: 173, 238, 207; - --color-400: 232, 239, 235; - --color-500: 232, 239, 235; - --color-600: 232, 239, 235; - --color-700: 232, 239, 235; - --color-800: 232, 239, 235; - --color-900: 232, 239, 235; + --color-100: 244,246,244; + --color-200: 229,235,231; + --color-300: 209,219,213; + --color-400: 155,175,161; + --color-500: 106,128,115; + --color-600: 76,99,81; + --color-700: 55,82,62; + --color-800: 31,55,38; + --color-900: 17,40,23; } /* ----------------------- VARIABLES --------------------- */ diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index 0e41b539d..aa673cb42 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -217,7 +217,7 @@ - + {% block Banner %} {% endblock %} @@ -233,7 +233,7 @@ {% block postNav %} {% endblock %} -
+
{% block desktopUserBanner %} From 736751f9faea063d77df4d9c55666b2915cc1300 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 17:45:17 -0600 Subject: [PATCH 004/195] fix --- files/static/dist/main.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 6ba270480..53f13fe23 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2806,6 +2806,16 @@ img.emoji-lg { box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.dark .dark\:bg-gray-700 { + --tw-bg-opacity: 1; + background-color: rgba(var(--color-700), var(--tw-bg-opacity)); +} + +.dark .dark\:text-gray-200 { + --tw-text-opacity: 1; + color: rgba(var(--color-200), var(--tw-text-opacity)); +} + @media (min-width: 640px) { .sm\:static { From 8344d3fa7cfe191546f0d7bfe3bdb51fd34c150b Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 17:56:54 -0600 Subject: [PATCH 005/195] dark --- files/templates/CHRISTMAS/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index aa673cb42..270913c98 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -251,7 +251,7 @@ {% endblock %}
-
+
{% block searchText %} {% endblock %} From 3a1d90a5ee44c8eddbad73f9f48294b53d7ce769 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 17:57:21 -0600 Subject: [PATCH 006/195] fix --- files/static/dist/main.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 53f13fe23..18b73a521 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2811,6 +2811,11 @@ img.emoji-lg { background-color: rgba(var(--color-700), var(--tw-bg-opacity)); } +.dark .dark\:bg-gray-800 { + --tw-bg-opacity: 1; + background-color: rgba(var(--color-800), var(--tw-bg-opacity)); +} + .dark .dark\:text-gray-200 { --tw-text-opacity: 1; color: rgba(var(--color-200), var(--tw-text-opacity)); From 11c616811e3351fe7824b321509397249cfccfd6 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:00:22 -0600 Subject: [PATCH 007/195] fix --- files/templates/CHRISTMAS/submission_listing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 726a039a5..65e449f5a 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -230,7 +230,7 @@
- + {{p.realtitle(v) | safe}}
From e914a71bce0d1a206606979645af0e8b816cee46 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:01:09 -0600 Subject: [PATCH 008/195] fix --- files/static/dist/main.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 18b73a521..9a6293e0b 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2821,6 +2821,11 @@ img.emoji-lg { color: rgba(var(--color-200), var(--tw-text-opacity)); } +.dark .dark\:visited\:text-gray-400:visited { + --tw-text-opacity: 1; + color: rgba(var(--color-400), var(--tw-text-opacity)); +} + @media (min-width: 640px) { .sm\:static { From 4e2c068be53cc6094bd8e7ce4a6f216e93986f55 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:04:15 -0600 Subject: [PATCH 009/195] fix --- files/static/dist/main.css | 5 +++++ files/templates/CHRISTMAS/submission_listing.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 9a6293e0b..7b77e212d 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2806,6 +2806,11 @@ img.emoji-lg { box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.dark .dark\:border-gray-700 { + --tw-border-opacity: 1; + border-color: rgba(var(--color-700), var(--tw-border-opacity)); +} + .dark .dark\:bg-gray-700 { --tw-bg-opacity: 1; background-color: rgba(var(--color-700), var(--tw-bg-opacity)); diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 65e449f5a..357656de2 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -40,7 +40,7 @@
{% endif %} -
  • +
  • From f18b877a35ac47c789231fbcf5ccfee8b225e966 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:06:10 -0600 Subject: [PATCH 010/195] fix --- files/static/dist/main.css | 4 ++++ files/templates/CHRISTMAS/submission_listing.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 7b77e212d..bd3565428 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2425,6 +2425,10 @@ img.emoji-lg { -o-object-fit: contain; object-fit: contain} +.last\:border-none:last-child { + border-style: none; +} + .odd\:bg-gray-200:nth-child(odd) { --tw-bg-opacity: 1; background-color: rgba(var(--color-200), var(--tw-bg-opacity)); diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 357656de2..d740b95b8 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -40,7 +40,7 @@
    {% endif %} -
  • +
  • From e07e80ba2fb50b6016dce74133e86a6ea15d1241 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:12:20 -0600 Subject: [PATCH 011/195] fix --- .../CHRISTMAS/sidebars/HomeSidebar.html | 27 +++++++++++++------ .../CHRISTMAS/submission_listing.html | 2 +- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html index 4d1e0ef60..4a1ba9769 100644 --- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html @@ -11,11 +11,13 @@ ribbon icon
    - + rDrama presents: FISTMAS 2021 | Santa Claus is CUMMING to town for the HOLIGAYS :marseysanta: - posted by @christmaspathianflorist + posted by + @christmaspathianflorist +
    • @@ -24,11 +26,14 @@ ribbon icon
    - + UI overhaul bug report thread - posted by @christmaspathianflorist + posted by + + @christmaspathianflorist +
    @@ -37,11 +42,14 @@ ribbon icon
    - + On the Twelfth day of Christmas MasterLawlz gave to meee [Finale] - posted by @HoHoHotep + posted by + + @HoHoHotep +
    @@ -50,11 +58,14 @@ ribbon icon
    - + PUBLIC DRAMACOIN MINE - posted by @SeetheFarmer + posted by + + @SeetheFarmer +
    diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index d740b95b8..357656de2 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -40,7 +40,7 @@
    {% endif %} -
  • +
  • From ce27ee14bd8b6473f1bf9039f70df5a3fc9a3fd2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:12:38 -0600 Subject: [PATCH 012/195] fix --- files/static/dist/main.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index bd3565428..445198f6e 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2425,10 +2425,6 @@ img.emoji-lg { -o-object-fit: contain; object-fit: contain} -.last\:border-none:last-child { - border-style: none; -} - .odd\:bg-gray-200:nth-child(odd) { --tw-bg-opacity: 1; background-color: rgba(var(--color-200), var(--tw-bg-opacity)); @@ -2835,6 +2831,11 @@ img.emoji-lg { color: rgba(var(--color-400), var(--tw-text-opacity)); } +.dark .dark\:hover\:text-gray-400:hover { + --tw-text-opacity: 1; + color: rgba(var(--color-400), var(--tw-text-opacity)); +} + @media (min-width: 640px) { .sm\:static { From 0523a4ec10b267aee90eb8d55634a59e8684c917 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:13:31 -0600 Subject: [PATCH 013/195] fix --- files/templates/CHRISTMAS/sidebars/HomeSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html index 4a1ba9769..158fa43aa 100644 --- a/files/templates/CHRISTMAS/sidebars/HomeSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/HomeSidebar.html @@ -2,7 +2,7 @@ -
    +

    Badges

      @@ -38,7 +38,7 @@ {% endif %}
    -
    +

    Awards

      @@ -55,7 +55,7 @@
    {% if v and (v.admin_level > 1 or v.alt) %} -
    +

    Alts

      diff --git a/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html b/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html index 6dc90b4fe..dfdd6b034 100644 --- a/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html @@ -22,14 +22,14 @@ {% endif %}
    -
    +

    Link

    -
    +
    -
    +

    DramaMetric™ diff --git a/files/templates/CHRISTMAS/sidebars/SubmitSidebar.html b/files/templates/CHRISTMAS/sidebars/SubmitSidebar.html index c40a67cdf..7b056f04d 100644 --- a/files/templates/CHRISTMAS/sidebars/SubmitSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/SubmitSidebar.html @@ -16,7 +16,7 @@

    {% endif %}
    • -
    +
    cozy fireplace log fire From 7e73477ab9a7e269e195ab73a19c7c596969229b Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 18:40:42 -0600 Subject: [PATCH 025/195] fix --- files/static/dist/main.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 032dff196..ea1500bc8 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2815,6 +2815,11 @@ img.emoji-lg { border-color: rgba(var(--color-700), var(--tw-border-opacity)); } +.dark .dark\:border-gray-900 { + --tw-border-opacity: 1; + border-color: rgba(var(--color-900), var(--tw-border-opacity)); +} + .dark .dark\:bg-gray-700 { --tw-bg-opacity: 1; background-color: rgba(var(--color-700), var(--tw-bg-opacity)); From bf351ec622a4faeefb4b7b77c4a2b43fdf460fae Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 19:07:31 -0600 Subject: [PATCH 026/195] fix --- files/templates/CHRISTMAS/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index 270913c98..a5c92985d 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -217,7 +217,7 @@ - + {% block Banner %} {% endblock %} From 5b3b387c8dd0bbf609cbb21d80f998e4480d2a5e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 19:08:06 -0600 Subject: [PATCH 027/195] fix --- files/static/dist/main.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index ea1500bc8..09b1911ce 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2834,6 +2834,11 @@ img.emoji-lg { background-image: none; } +.dark .dark\:text-gray-100 { + --tw-text-opacity: 1; + color: rgba(var(--color-100), var(--tw-text-opacity)); +} + .dark .dark\:text-gray-200 { --tw-text-opacity: 1; color: rgba(var(--color-200), var(--tw-text-opacity)); From 9673e65a2b3e7c6eb4325c97f2002b910992e10a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 19:13:12 -0600 Subject: [PATCH 028/195] fix --- files/static/src/main.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/files/static/src/main.css b/files/static/src/main.css index d9bafd832..ad705b953 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -3,6 +3,7 @@ @tailwind utilities; .theme-midnight { + --color-primary: 2,132,199; --color-100: 244,244,245; --color-200: 228,228,231; --color-300: 212,212,216; @@ -15,6 +16,7 @@ } .theme-canary { + --color-primary: 2,132,199; --color-100: 252,231,243; --color-200: 251,207,232; --color-300: 249,168,212; @@ -27,6 +29,7 @@ } .theme-evergreen { + --color-primary: 220, 38, 38; --color-100: 244,246,244; --color-200: 229,235,231; --color-300: 209,219,213; @@ -39,9 +42,9 @@ } /* ----------------------- VARIABLES --------------------- */ -:root { +/*:root { --color-primary: 220, 38, 38; -} +}*/ /* ---------------- RESPONSIVE UTILITIES ----------------- */ @responsive { From 26796bf816b56c9bd32ea9e1079d41fb1b3f2e51 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 19:13:37 -0600 Subject: [PATCH 029/195] primary color --- files/static/dist/main.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 09b1911ce..0eccca15d 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2164,6 +2164,7 @@ video { } .theme-midnight { + --color-primary: 2,132,199; --color-100: 244,244,245; --color-200: 228,228,231; --color-300: 212,212,216; @@ -2176,6 +2177,7 @@ video { } .theme-canary { + --color-primary: 2,132,199; --color-100: 252,231,243; --color-200: 251,207,232; --color-300: 249,168,212; @@ -2188,6 +2190,7 @@ video { } .theme-evergreen { + --color-primary: 220, 38, 38; --color-100: 244,246,244; --color-200: 229,235,231; --color-300: 209,219,213; @@ -2200,9 +2203,9 @@ video { } /* ----------------------- VARIABLES --------------------- */ -:root { +/*:root { --color-primary: 220, 38, 38; -} +}*/ /* ---------------- RESPONSIVE UTILITIES ----------------- */ From 3a59b834f28cce8d779e47b497cb25e7bd63eafb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 20:01:35 -0600 Subject: [PATCH 030/195] fix --- files/templates/CHRISTMAS/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index a5c92985d..5489611e9 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -217,7 +217,7 @@ - + {% block Banner %} {% endblock %} From 32a1b8e739588224e2eab4ee63c9efbf262025cf Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sat, 18 Dec 2021 20:02:55 -0600 Subject: [PATCH 031/195] fix --- files/templates/CHRISTMAS/submission_listing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 357656de2..bf9101745 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -381,7 +381,7 @@ {% include "expanded_image_modal.html" %} - + - + {% include "CHRISTMAS/header-tw.html" %} @@ -215,7 +215,23 @@ {% if v %} - + + {% endif %} + + \ No newline at end of file From 8b9687801de3bd4bffd697e5329a7644f6386bca Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:01:43 -0600 Subject: [PATCH 162/195] fix --- files/templates/CHRISTMAS/default.html | 24 ++++++++---------------- files/templates/CHRISTMAS/settings.html | 1 + 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index ab64241cb..c288bd5e4 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -281,36 +281,28 @@ {% include "CHRISTMAS/mobile_navigation_bar.html" %} {% endblock %} -{% block actionsModal %} -{% endblock %} +{% block actionsModal %}{% endblock %} -{% block reportCommentModal %} -{% endblock %} +{% block reportCommentModal %}{% endblock %} -{% block GIFtoast %} -{% endblock %} +{% block GIFtoast %}{% endblock %} -{% block GIFpicker %} -{% endblock %} +{% block GIFpicker %}{% endblock %} {% include "CHRISTMAS/toasts/toasts.html" %} -{% block modals %} -{% endblock %} +{% block modals %}{% endblock %} {% if v %} {% include "CHRISTMAS/modals/ModalThemePicker.html" %} {% endif %} -{% block popovers %} -{% endblock %} +{% block popovers %}{% endblock %} -{% block fixedMobileBarJS %} -{% endblock %} +{% block fixedMobileBarJS %}{% endblock %} -{% block scripts %} -{% endblock %} +{% block scripts %}{% endblock %} diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index 87fb05e5a..991a3ed04 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -178,6 +178,7 @@ {% if v %} {% include "CHRISTMAS/modals/Modal2FA.html" %} + {% include "CHRISTMAS/modals/ModalThemePicker.html" %} {% endif %} {% block modals %}{% endblock %} From 4b6a44635f3dedc2658cc7cbdd06e997a313be3a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:07:35 -0600 Subject: [PATCH 163/195] fix --- files/static/src/main.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/files/static/src/main.css b/files/static/src/main.css index 536bcc006..2a88ed038 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -178,6 +178,12 @@ ul { @apply mb-3 } + .comment-text ul, .post-body ul { + @apply list-disc + } + .comment-text ol, .post-body ol { + @apply list-decimal + } strong { @apply font-bold } From 2b571bc3f5d4bff8ec07a2b3da8863c52bc620ae Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:08:30 -0600 Subject: [PATCH 164/195] fix --- files/static/dist/main.css | 6 ++++++ files/static/src/main.css | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index a1aa2ede3..9fa9cab22 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -669,6 +669,12 @@ video { } ul { margin-bottom: 0.75rem; +} + .comment-text ul, .post-body ul { + list-style-type: disc; +} + .comment-text ol, .post-body ol { + list-style-type: decimal; } strong { font-weight: 700; diff --git a/files/static/src/main.css b/files/static/src/main.css index 2a88ed038..51a5b2eb4 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -179,10 +179,10 @@ @apply mb-3 } .comment-text ul, .post-body ul { - @apply list-disc + @apply list-disc pl-4 } .comment-text ol, .post-body ol { - @apply list-decimal + @apply list-decimal pl-4 } strong { @apply font-bold From b42049ea4046e96efd75a95a6c1f9db1becf4ec6 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:08:46 -0600 Subject: [PATCH 165/195] fix --- files/static/dist/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 9fa9cab22..28dd1055a 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -672,9 +672,11 @@ video { } .comment-text ul, .post-body ul { list-style-type: disc; + padding-left: 1rem; } .comment-text ol, .post-body ol { list-style-type: decimal; + padding-left: 1rem; } strong { font-weight: 700; From 2360e455c7163bfd0726a2d41dd4cb4132539eda Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:10:12 -0600 Subject: [PATCH 166/195] fix --- files/templates/CHRISTMAS/comments.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/comments.html b/files/templates/CHRISTMAS/comments.html index ca4b29786..f4f0f396b 100644 --- a/files/templates/CHRISTMAS/comments.html +++ b/files/templates/CHRISTMAS/comments.html @@ -324,7 +324,7 @@
    Removed by @{{c.ban_reason}}
    {% endif %} -
    +
    {{c.realbody(v) | safe}} {% if c.options %} {% for o in c.options %} From fe8f6a3d9780f3b7dc5cd8799cf44e4f9918d0d8 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:11:16 -0600 Subject: [PATCH 167/195] fix --- files/templates/CHRISTMAS/settings.html | 1 - 1 file changed, 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index 991a3ed04..62951967d 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -1,7 +1,6 @@ - From 17fcbe47c5bf592a50d0c967dae9d5772a831771 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:14:00 -0600 Subject: [PATCH 168/195] fix --- files/templates/CHRISTMAS/submission_listing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 27ebec49e..643ea1ad1 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -86,7 +86,7 @@
    -
    +
    {{ p.author.username }} avatar From 9e7e1c551d3514397417908533a10221b197fffb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:14:24 -0600 Subject: [PATCH 169/195] fix --- files/static/dist/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 28dd1055a..e277b1c01 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -3175,6 +3175,10 @@ video { margin-bottom: 1rem; } + .md\:mb-1 { + margin-bottom: 0.25rem; + } + .md\:ml-\[4\.5rem\] { margin-left: 4.5rem; } From 9687d9bafda2b030a6ff78350ecf9e341ad0d5f7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:15:14 -0600 Subject: [PATCH 170/195] fix --- files/templates/CHRISTMAS/submission_listing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 643ea1ad1..25f52f44f 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -86,7 +86,7 @@
    -
    +
    {{ p.author.username }} avatar From fd1b30a95574cfa39e9bad594454314661b6712f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:15:35 -0600 Subject: [PATCH 171/195] fix --- files/static/dist/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index e277b1c01..12208dd12 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -3175,8 +3175,8 @@ video { margin-bottom: 1rem; } - .md\:mb-1 { - margin-bottom: 0.25rem; + .md\:mb-0 { + margin-bottom: 0px; } .md\:ml-\[4\.5rem\] { From 6aa5f3750c9086619e5097b6fbf59f6939707cc3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:17:51 -0600 Subject: [PATCH 172/195] fix --- .../CHRISTMAS/submission_listing.html | 118 +++++++++--------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index 25f52f44f..7e6c1e94e 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -171,64 +171,66 @@ {% endif %}
    -
      - - {% if p.flair %} -
    • - - {{p.flair | safe}} - -
      • - {% endif %} - - {% if p.over_18 %} -
    • - +18 -
      • - {% endif %} - - {% if p.club %} -
    • - Country Club -
      • - {% endif %} - - {% if p.stickied %} -
    • - - - Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%} - -
      • - {% endif %} - - {% if p.is_pinned and request.path.startswith('/@') %} -
    • - - - Pinned to profile - -
      • - {% endif %} - - {% if p.private %} -
    • - - - Draft - -
      • - {% endif %} - - {% if p.awards %} - {% for a in p.awards %} -
    • - -
      • - {% endfor %} - {% endif %} -
    - + {% if p.flair or p.over_18 or p.club or p.stickied or (p.is_pinned and request.path.startswith('/@')) or p.private or p.awards %} +
      + + {% if p.flair %} +
    • + + {{p.flair | safe}} + +
      • + {% endif %} + + {% if p.over_18 %} +
    • + +18 +
      • + {% endif %} + + {% if p.club %} +
    • + Country Club +
      • + {% endif %} + + {% if p.stickied %} +
    • + + + Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%} + +
      • + {% endif %} + + {% if p.is_pinned and request.path.startswith('/@') %} +
    • + + + Pinned to profile + +
      • + {% endif %} + + {% if p.private %} +
    • + + + Draft + +
      • + {% endif %} + + {% if p.awards %} + {% for a in p.awards %} +
    • + +
      • + {% endfor %} + {% endif %} +
    + {% endif %} +
    {{p.realtitle(v) | safe}} From 9564c52d18d58642e4a8dd96fb548315da839dc3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 19 Dec 2021 15:27:18 -0600 Subject: [PATCH 173/195] fix --- .../templates/CHRISTMAS/mobile_navigation_bar.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/files/templates/CHRISTMAS/mobile_navigation_bar.html b/files/templates/CHRISTMAS/mobile_navigation_bar.html index 884e25742..113f5356f 100644 --- a/files/templates/CHRISTMAS/mobile_navigation_bar.html +++ b/files/templates/CHRISTMAS/mobile_navigation_bar.html @@ -1,12 +1,12 @@
    -
    +