From 068258c70b74ccd6d6d0bc257f8e8f7170344d8a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:03:57 -0600 Subject: [PATCH 001/132] fix --- files/templates/CHRISTMAS/settings_security.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_security.html b/files/templates/CHRISTMAS/settings_security.html index d78f88296..36a5670be 100644 --- a/files/templates/CHRISTMAS/settings_security.html +++ b/files/templates/CHRISTMAS/settings_security.html @@ -267,6 +267,6 @@ document.getElementById("emailpasswordRequired").classList.remove("hidden"); }); }); - const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal')) + var twoStepModal = new bootstrap.Modal(document.getElementById('2faModal')) {% endblock %} From e75debeba931cacd38d8a8c91cd480fe8af5e2d1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:07:47 -0600 Subject: [PATCH 002/132] fix --- files/templates/CHRISTMAS/settings_security.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_security.html b/files/templates/CHRISTMAS/settings_security.html index 36a5670be..d78f88296 100644 --- a/files/templates/CHRISTMAS/settings_security.html +++ b/files/templates/CHRISTMAS/settings_security.html @@ -267,6 +267,6 @@ document.getElementById("emailpasswordRequired").classList.remove("hidden"); }); }); - var twoStepModal = new bootstrap.Modal(document.getElementById('2faModal')) + const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal')) {% endblock %} From fa10d26d40e69204eaf7438b6eea9b0aa7a65db7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:08:45 -0600 Subject: [PATCH 003/132] fix --- files/templates/CHRISTMAS/settings.html | 7 +++++-- files/templates/CHRISTMAS/settings_security.html | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index cd12bab13..cb1ffa28c 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -220,9 +220,9 @@ {% if v %} - - + {% endif %} diff --git a/files/templates/CHRISTMAS/settings_security.html b/files/templates/CHRISTMAS/settings_security.html index d78f88296..f19bdae0b 100644 --- a/files/templates/CHRISTMAS/settings_security.html +++ b/files/templates/CHRISTMAS/settings_security.html @@ -267,6 +267,5 @@ document.getElementById("emailpasswordRequired").classList.remove("hidden"); }); }); - const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal')) {% endblock %} From 01d0f317f0e992ba32deabed6d1bcfcf6fc143a4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:11:09 -0600 Subject: [PATCH 004/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 61d47d3b7..64035b889 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -67,4 +67,13 @@ {% endif %} + {% if v and (v.admin_level > 1 %} +
+
+

+ Moderate + +

+
+ {% endif %} \ No newline at end of file From 405d6887ee40bbcbc219dd80eb0164dac29ee611 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:11:41 -0600 Subject: [PATCH 005/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 64035b889..042354dde 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -67,7 +67,7 @@ {% endif %} - {% if v and (v.admin_level > 1 %} + {% if v and v.admin_level > 1 %}

From 7057ff6f0a3f40f43a038d7e9a6a022660b02837 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:13:13 -0600 Subject: [PATCH 006/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 042354dde..3c122c220 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -72,7 +72,7 @@

Moderate - +

{% endif %} From 7012b02bfea043e452fe66f4b056763aec753f38 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:15:29 -0600 Subject: [PATCH 007/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 144 +++++++++--------- 1 file changed, 73 insertions(+), 71 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 3c122c220..8c435cef7 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -1,79 +1,81 @@ -

    -
  • - +
  • +
    - + Displays a badge next to their username
    From b6391042adda27772a8b011290917f3f2147bdaa Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:34:05 -0600 Subject: [PATCH 017/132] fix --- files/static/dist/main.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index aec122f5d..d46986ad8 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -1432,6 +1432,11 @@ video { margin-right: calc(1.25rem * var(--tw-space-x-reverse)); margin-left: calc(1.25rem * calc(1 - var(--tw-space-x-reverse))); } +.space-x-1 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(0.25rem * var(--tw-space-x-reverse)); + margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse))); +} .divide-x > :not([hidden]) ~ :not([hidden]) { --tw-divide-x-reverse: 0; border-right-width: calc(1px * var(--tw-divide-x-reverse)); @@ -1608,6 +1613,10 @@ video { --tw-border-opacity: 1; border-color: rgba(var(--color-200), var(--tw-border-opacity)); } +.border-yellow-400 { + --tw-border-opacity: 1; + border-color: rgba(251, 191, 36, var(--tw-border-opacity)); +} .border-opacity-10 { --tw-border-opacity: 0.1; } From 95473f08102995a5fb8c2bb7fff866c33bc18650 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 18:38:52 -0600 Subject: [PATCH 018/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index b288be037..999068e9c 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -1,6 +1,6 @@
-
+
@@ -61,7 +61,7 @@
  • -
    +
    • From 399e348736dcbb1e046e2496c4737dba1989b1b4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 19:12:11 -0600 Subject: [PATCH 057/132] 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 ca3c778c5..bae4f976e 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -1615,9 +1615,9 @@ video { .border-yellow-700\/20 { border-color: rgba(180, 83, 9, 0.2); } -.border-red-400 { +.border-red-300 { --tw-border-opacity: 1; - border-color: rgba(248, 113, 113, var(--tw-border-opacity)); + border-color: rgba(252, 165, 165, var(--tw-border-opacity)); } .border-opacity-10 { --tw-border-opacity: 0.1; From de17ce64fae41d624e0f397b38026ff7d8d10ebb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 19:13:06 -0600 Subject: [PATCH 058/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index ae9b6d500..ef8165199 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -45,7 +45,7 @@
    - +

    Manage User (Danger Zone) From 8f44e0d4c38d0a49d719ea23e7675dcaae266495 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 19:14:49 -0600 Subject: [PATCH 059/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index ef8165199..90e2603f3 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -45,7 +45,7 @@

    - +

    Manage User (Danger Zone) From caf62c3f6d8ba33e53f15f5c8e03bc85b3819bfb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 19:16:47 -0600 Subject: [PATCH 060/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 90e2603f3..ff30966d9 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -7,7 +7,7 @@

    Manage User

    -
      +
      • @@ -17,9 +17,6 @@
        • -
      • -
        -
      • @@ -29,9 +26,6 @@
        • -
      • -
        -
      • From 60f35909d315055208675f4e78160818d2786c7d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 19:17:12 -0600 Subject: [PATCH 061/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index ff30966d9..3671cce5c 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -1,7 +1,7 @@

    - +

    From 2175c7f521ed34e278cdae96971365dbd4df8944 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 19:29:20 -0600 Subject: [PATCH 062/132] fix --- files/templates/CHRISTMAS/emoji_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/emoji_modal.html b/files/templates/CHRISTMAS/emoji_modal.html index 57f4a0d36..481d3b364 100644 --- a/files/templates/CHRISTMAS/emoji_modal.html +++ b/files/templates/CHRISTMAS/emoji_modal.html @@ -40,7 +40,7 @@

    - +
    From f0012f1cbda97b22c272cd91039d4482d0fc6098 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 20:37:54 -0600 Subject: [PATCH 063/132] fix --- files/templates/CHRISTMAS/default.html | 2 +- files/templates/CHRISTMAS/settings.html | 2 +- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index ba5c0e471..2dc3faebc 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -360,7 +360,7 @@ } {% endif %} - + diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html index cb1ffa28c..f379d2169 100644 --- a/files/templates/CHRISTMAS/settings.html +++ b/files/templates/CHRISTMAS/settings.html @@ -241,6 +241,6 @@ {% endif %} - + \ No newline at end of file diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 3671cce5c..950648358 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -27,7 +27,7 @@
  • - +
    From e50f6a4b74d3d99885673ea10349f19281c88c75 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 20:44:50 -0600 Subject: [PATCH 064/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 950648358..03be7f649 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -26,8 +26,17 @@
    • -
  • - +
    • + - -
  • +
    diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 9eb982fa8..643091559 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -457,5 +457,5 @@ {% endif %} - + {% endblock %} \ No newline at end of file From a84b0e91fad99f154737802da38a5ed5bad6d4fe Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 20:51:53 -0600 Subject: [PATCH 066/132] Update ProfileSidebar.html --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index cb2928a1c..f6b5641c1 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -26,7 +26,7 @@
    • -
  • +
  • From 791cd3fd65cf980fd7f5491975a6a16ed3a5b35e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 20:58:28 -0600 Subject: [PATCH 067/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index f6b5641c1..1914ae7dc 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -18,7 +18,7 @@
  • - +
    From e69f2c124ff8ae5e56186157ffe790a3eae69e40 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 20:58:39 -0600 Subject: [PATCH 068/132] fix --- files/templates/CHRISTMAS/userpage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 643091559..cf69f4b24 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -457,5 +457,5 @@ {% endif %} - + {% endblock %} \ No newline at end of file From 4bcb552764d05ed24bed1e3d74f8bdc9579c8280 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:04:14 -0600 Subject: [PATCH 069/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 1914ae7dc..e77997085 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -9,7 +9,7 @@
    • - +
      @@ -18,7 +18,7 @@
    • - +
      @@ -27,7 +27,7 @@
    • - +
      @@ -42,7 +42,7 @@

      - Manage User (Danger Zone) + Danger Zone

      • From 26ab6766a974cae040847436468507083201ef68 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:04:22 -0600 Subject: [PATCH 070/132] fix --- files/templates/CHRISTMAS/userpage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index cf69f4b24..df126e4c5 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -457,5 +457,5 @@ {% endif %} - + {% endblock %} \ No newline at end of file From f13b10dd69083bbc2b62023368e1baae2be1eb2e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:07:48 -0600 Subject: [PATCH 071/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index e77997085..06c3ee899 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -44,9 +44,9 @@

        Danger Zone

        -
          +
          • - + 1 %}checked{% endif %}>
            @@ -54,9 +54,6 @@
            • -
          • -
            -
      {% endif %} From 0cd842e0ae0a06c1ba5951e42d1488763a5394c5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:08:16 -0600 Subject: [PATCH 072/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- files/templates/CHRISTMAS/userpage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 06c3ee899..2328b55ca 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -46,7 +46,7 @@
      • - 1 %}checked{% endif %}> + 1 %}checked{% endif %}>
        diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index df126e4c5..3abcc0aa0 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -457,5 +457,5 @@ {% endif %} - + {% endblock %} \ No newline at end of file From 8fc74269a330df9cc6b81175911436a1c1b30e2e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:19:18 -0600 Subject: [PATCH 073/132] fix --- .../CHRISTMAS/dropdowns/ProfileAdminDropdown.html | 8 +------- .../templates/CHRISTMAS/sidebars/ProfileSidebar.html | 12 +++++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/files/templates/CHRISTMAS/dropdowns/ProfileAdminDropdown.html b/files/templates/CHRISTMAS/dropdowns/ProfileAdminDropdown.html index ca3d8262b..120409bf9 100644 --- a/files/templates/CHRISTMAS/dropdowns/ProfileAdminDropdown.html +++ b/files/templates/CHRISTMAS/dropdowns/ProfileAdminDropdown.html @@ -63,14 +63,8 @@
        • -
      • - -
      • - diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 2328b55ca..4b2bc87fc 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -45,14 +45,12 @@ Danger Zone
          + {% if v.admin_level > 2 %}
        • - 1 %}checked{% endif %}> -
          - - - Make @{{ u.username }} an admin. - -
          +
    From 88223a414b0444007d703cf351ed2d305474dc45 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:19:35 -0600 Subject: [PATCH 074/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 1 + 1 file changed, 1 insertion(+) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 4b2bc87fc..cc68e29f6 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -52,6 +52,7 @@ Revoke Admin Permissions
    • + {% endif %} {% endif %} From 0a3aa942bd42922693cd725c49080398cf316f68 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:19:52 -0600 Subject: [PATCH 075/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index cc68e29f6..a4bf0f3dc 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -47,7 +47,7 @@
      {% if v.admin_level > 2 %}
    • - From 57c22bfb0965cc044d38ab426af0fb858b881af5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:23:21 -0600 Subject: [PATCH 076/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index a4bf0f3dc..b5509a6aa 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -45,9 +45,37 @@ Danger Zone
        + {% if u.is_suspended %} + + {% else %} +
        + + + + +
        +
        + + +
        +
        + +
        + {% endif %} {% if v.admin_level > 2 %}
      • - From cc7ffab7f633b271e66d32011e710c213e12ccd3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:27:02 -0600 Subject: [PATCH 077/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index b5509a6aa..86a8e378f 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -54,30 +54,32 @@ {% else %} -
        + - - -
        + +
        -
        - + +
        {% endif %} {% if v.admin_level > 2 %}
        • {% endif %} From c25f1e323b4bc1dcd06b5bf1fc488e5252cdd1eb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:28:58 -0600 Subject: [PATCH 078/132] fix --- .../templates/CHRISTMAS/sidebars/ProfileSidebar.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 86a8e378f..ba5e62383 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -49,9 +49,9 @@ + +
        + + + Ban rogue accounts connected to @{{ u.username }} + +
        From 3e04745c4687661a09ea039b65a9adbb7d74c346 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:49:58 -0600 Subject: [PATCH 090/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index da1af9374..682062326 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -164,8 +164,14 @@

        Alts

        From ce2384bbc89fb839c67cdcdd9feaefe504a2a7fc Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:51:14 -0600 Subject: [PATCH 091/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 682062326..887c33824 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -162,11 +162,11 @@

        Alts

        -
          +
            {% for account in u.alts_unique %}
          • - @{{account.username}} avatar - + @{{account.username}} avatar + @{{account.username}} {% if account._is_manual %} From 81edcd55acdc2704312f70dde964e3fbdd4a8f2a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:51:24 -0600 Subject: [PATCH 092/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 887c33824..1df1a9c85 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -165,7 +165,7 @@
              {% for account in u.alts_unique %}
            • - @{{account.username}} avatar + @{{account.username}} avatar @{{account.username}} From 2d47abfba54704d31be9e96e6b2c367ea9af45eb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:51:53 -0600 Subject: [PATCH 093/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 1df1a9c85..ebd574f86 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -165,7 +165,7 @@
                {% for account in u.alts_unique %}
              • - @{{account.username}} avatar + @{{account.username}} avatar @{{account.username}} From b40e38280b85058653256b7c7551531e502a0987 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:52:55 -0600 Subject: [PATCH 094/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index ebd574f86..5f1f754e0 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -39,7 +39,7 @@
        - +

        Danger Zone From 2f857e4e4808c1d51eaee83d98ddd76c138477d3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:53:12 -0600 Subject: [PATCH 095/132] fix --- files/static/dist/main.css | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index bae4f976e..33fdba57d 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -1247,12 +1247,12 @@ video { .w-5 { width: 1.25rem; } -.w-44 { - width: 11rem; -} .w-7 { width: 1.75rem; } +.w-44 { + width: 11rem; +} .min-w-full { min-width: 100%; } @@ -1612,9 +1612,6 @@ video { --tw-border-opacity: 1; border-color: rgba(251, 191, 36, var(--tw-border-opacity)); } -.border-yellow-700\/20 { - border-color: rgba(180, 83, 9, 0.2); -} .border-red-300 { --tw-border-opacity: 1; border-color: rgba(252, 165, 165, var(--tw-border-opacity)); @@ -3193,6 +3190,18 @@ video { transform: var(--tw-transform); } +@keyframes pulse { + + 50% { + opacity: .5; + } +} + +.hover\:animate-pulse:hover { + -webkit-animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; + animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; +} + .hover\:border-gray-400:hover { --tw-border-opacity: 1; border-color: rgba(var(--color-400), var(--tw-border-opacity)); From 44df7c271b0247219aaca8b8931221fc8769fea8 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:54:09 -0600 Subject: [PATCH 096/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 5f1f754e0..e4e9ab263 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -37,9 +37,9 @@

      -
      +
      - +

      Danger Zone From 6b6a9121caae4c01e6bcf64f958429423c7d6697 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 21:54:29 -0600 Subject: [PATCH 097/132] fix --- files/static/dist/main.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 33fdba57d..8d9eed4db 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -3190,18 +3190,6 @@ video { transform: var(--tw-transform); } -@keyframes pulse { - - 50% { - opacity: .5; - } -} - -.hover\:animate-pulse:hover { - -webkit-animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; - animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; -} - .hover\:border-gray-400:hover { --tw-border-opacity: 1; border-color: rgba(var(--color-400), var(--tw-border-opacity)); @@ -3538,6 +3526,18 @@ video { display: block; } +@keyframes pulse { + + 50% { + opacity: .5; + } +} + +.group:hover .group-hover\:animate-pulse { + -webkit-animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; + animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; +} + .peer:checked ~ .peer-checked\:border-blue-500 { --tw-border-opacity: 1; border-color: rgba(14, 165, 233, var(--tw-border-opacity)); From 87a2c497bfb2ba6fb7fd476298a645c2bf7530ad Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:00:06 -0600 Subject: [PATCH 098/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index e4e9ab263..dcf2f95a3 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -13,7 +13,7 @@
      - Gives {{ u.username }} a badge. + Gives {{ u.username }} a badge

      • @@ -22,7 +22,7 @@
      - Grant @{{ u.username }} access to the Country Club. + Grant @{{ u.username }} access to the Country Club
      @@ -31,13 +31,37 @@
      - Give @{{ u.username }} meme moderator status. + Give @{{ u.username }} meme moderator status
      +
    • + + + +
      + +
      + +
      + + + Restrict @{{ u.username }} from updating their flair + +
      +
      + +
      + +
    -
    +
    @@ -85,7 +109,7 @@ Ban user - + {% endif %} From b940cfd71fdfb609e1f948eb0a5775791c79e9ff Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:01:58 -0600 Subject: [PATCH 099/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index dcf2f95a3..3c8c958ed 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -38,25 +38,25 @@
    • From 2210a9ef1b7757849f4092126300a1699f420c3a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:02:19 -0600 Subject: [PATCH 100/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 3c8c958ed..374b06913 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -40,7 +40,7 @@
    -
    From 007dca2d7c696eed6b7e92d1e7c1a9c94f515e39 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:02:38 -0600 Subject: [PATCH 101/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 374b06913..69ceeb956 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -38,7 +38,7 @@
  • +
    Custom flair
    From fa9ee64165d9e386e72a2652ec1b1e55463756c1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:04:25 -0600 Subject: [PATCH 103/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index c6a1d024e..66290340b 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -54,7 +54,7 @@
    • - From dc9808ddeb00029850fbfae577a20551731fec82 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:04:54 -0600 Subject: [PATCH 104/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 66290340b..c6ab2ffd9 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -7,7 +7,7 @@

    Manage User

    -
      +
      • @@ -69,7 +69,7 @@

        Danger Zone

        -
          +
          • {% if u.is_suspended %}
            Unban {{ u.username }}
            From a9e712b27c870b03c190a8144c831d7492171efa Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:07:27 -0600 Subject: [PATCH 105/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index c6ab2ffd9..1a68e04d4 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -8,35 +8,40 @@ Manage User
              -
            • - -
              - - - Gives {{ u.username }} a badge - -
              -
              • -
            • - -
              - - - Grant @{{ u.username }} access to the Country Club - -
              -
              • -
            • - -
              - - - Give @{{ u.username }} meme moderator status - -
              +
            • +
              Attributes
              +
                +
              • + +
                + + + Gives {{ u.username }} a badge + +
                +
                • +
              • + +
                + + + Grant @{{ u.username }} access to the Country Club + +
                +
                • +
              • + +
                + + + Give @{{ u.username }} meme moderator status + +
                +
                • +
            • -
              Custom flair
              +
              Custom flair
              @@ -72,7 +77,7 @@
              • {% if u.is_suspended %} -
                Unban {{ u.username }}
                +
                Unban {{ u.username }}
                @@ -91,7 +96,7 @@ {% else %} -
                Ban {{ u.username }}
                +
                Ban {{ u.username }}
                + {% endif %} +
                • +
              • +
                Content
                + +
                • - {% endif %} {% if v.admin_level > 2 %}
              • Admin persmissions
                From bd6847c3a30400531d6b63f63adf70b40f29405b Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:23:38 -0600 Subject: [PATCH 108/132] Update ProfileSidebar.html --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index c517b4fb2..56ce881b7 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -120,7 +120,7 @@
              • Content
                -
                • +
              • +
                Shadow Ban
                + + +
              • Content
                • +
              • +
                Damage control
                + +
                • {% if v.admin_level > 2 %}
              • Admin persmissions
                From 356cc8bfc24ff7bcae4af06761a30d1c35c2d2c1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:38:12 -0600 Subject: [PATCH 110/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 40abbbefa..839635d61 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -120,18 +120,14 @@
              • Shadow Ban
                - - + +
              • Content
                From 3ba1eceae0cc73d8f5b81e62c03e4d43264da972 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:38:34 -0600 Subject: [PATCH 111/132] Revert "fix" This reverts commit 356cc8bfc24ff7bcae4af06761a30d1c35c2d2c1. --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 839635d61..40abbbefa 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -120,14 +120,18 @@
              • Shadow Ban
                - - + +
              • Content
                From 8f06e6942ca2306adc2109f33ebaad4ac7580ca8 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:39:24 -0600 Subject: [PATCH 112/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 40abbbefa..c069fa928 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -121,7 +121,7 @@
              • Shadow Ban
              • Damage control
                - From 755a923867add7964398b919745ec09bb1fcdeb3 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:40:18 -0600 Subject: [PATCH 113/132] fix --- files/static/src/main.css | 3 +++ files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/files/static/src/main.css b/files/static/src/main.css index 7efbffb83..59e743b47 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -404,6 +404,9 @@ .btn-blue { @apply bg-gradient-to-t from-blue-700 to-blue-600 hover:from-blue-600 hover:to-blue-700 border-blue-900 text-gray-100 focus:text-gray-200; } + .btn-yellow { + @apply bg-gradient-to-t from-yellow-700 to-yellow-600 hover:from-yellow-600 hover:to-yellow-700 border-yellow-900 text-gray-100 focus:text-gray-200; + } .btn-gray { @apply bg-gradient-to-t from-gray-200 to-gray-100 hover:from-gray-100 hover:to-gray-200 border-gray-300 text-gray-700 focus:text-gray-900; } diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index c069fa928..91a32f041 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -154,7 +154,7 @@
              • Damage control
                - From df94e650dba1c5f125cae2efc038986ca7c53094 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:40:29 -0600 Subject: [PATCH 114/132] fix --- files/static/dist/main.css | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 8d9eed4db..1c8ef1e39 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2994,6 +2994,25 @@ video { .btn-blue:focus { --tw-text-opacity: 1; color: rgba(var(--color-200), var(--tw-text-opacity)); +} + .btn-yellow { + --tw-border-opacity: 1; + border-color: rgba(120, 53, 15, var(--tw-border-opacity)); + background-image: linear-gradient(to top, var(--tw-gradient-stops)); + --tw-gradient-from: #b45309; + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(180, 83, 9, 0)); + --tw-gradient-to: #d97706; + --tw-text-opacity: 1; + color: rgba(var(--color-100), var(--tw-text-opacity)); +} + .btn-yellow:hover { + --tw-gradient-from: #d97706; + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgba(217, 119, 6, 0)); + --tw-gradient-to: #b45309; +} + .btn-yellow:focus { + --tw-text-opacity: 1; + color: rgba(var(--color-200), var(--tw-text-opacity)); } .btn-gray { --tw-border-opacity: 1; From a3269287a1770bdb8b914bc3a5c1859c6d28c0c8 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:41:41 -0600 Subject: [PATCH 115/132] fix --- files/static/src/main.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/files/static/src/main.css b/files/static/src/main.css index 59e743b47..84951e7dc 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -407,6 +407,9 @@ .btn-yellow { @apply bg-gradient-to-t from-yellow-700 to-yellow-600 hover:from-yellow-600 hover:to-yellow-700 border-yellow-900 text-gray-100 focus:text-gray-200; } + .btn-black { + @apply bg-white bg-gradient-to-t from-black to-black/80 hover:from-black/90 hover:to-black border-black/10 text-gray-100 focus:text-gray-200; + } .btn-gray { @apply bg-gradient-to-t from-gray-200 to-gray-100 hover:from-gray-100 hover:to-gray-200 border-gray-300 text-gray-700 focus:text-gray-900; } From 4bc9e903f1f3464987bc0c94f96466e4ac9b8972 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:42:00 -0600 Subject: [PATCH 116/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 91a32f041..fcffcd353 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -121,7 +121,7 @@
              • Shadow Ban
              - From 685602bc6c2af4f56241292485830bee28d34480 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:47:14 -0600 Subject: [PATCH 119/132] fix --- .../CHRISTMAS/sidebars/ProfileSidebar.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 290223f01..9ad599e2f 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -75,6 +75,23 @@ Danger Zone
                +
              • +
                Agendaposter Mode
                + + +
              • {% if u.is_suspended %}
                Unban {{ u.username }}
                From 8c80ac93cc12a8199762562fac305962a01c9312 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 22:47:38 -0600 Subject: [PATCH 120/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index 9ad599e2f..5c02f7e8d 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -77,7 +77,7 @@
                • Agendaposter Mode
                  -
                  • -
                • - -
                  - - - Give @{{ u.username }} meme moderator status - -
                  -
              • @@ -75,6 +66,21 @@ Danger Zone
                  +
                • +
                  Meme Moderator Status
                  + + +
                • Agendaposter Mode
                • -
                  Damage control
                  +
                  Damage Control
                  • {% if v.admin_level > 2 %}
                • -
                  Admin persmissions
                  +
                  Admin Persmissions
                  • - {% if v.admin_level > 2 %} + {% if v.admin_level > 2 and u.admin_level < 2 %}
                • Admin Persmissions
                  • - {% if v.admin_level > 2 and u.admin_level < 2 %} + {% if v.admin_level > 2 and u.admin_level > 2 %}
                • Admin Persmissions
                • + {% if v.id != u.id %}
              • Custom flair
                • + {% endif %}
        diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 5a22f1104..aa8d0249a 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -136,6 +136,10 @@ @{{u.original_username}}
        +
        ·
        +
        + {{u.id}} +
        {% endif %}
    From 767f2d03e6776ddc33d34808241794871edfcc1b Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 23:14:01 -0600 Subject: [PATCH 129/132] fix --- files/templates/CHRISTMAS/userpage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index aa8d0249a..88fefa581 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -138,7 +138,7 @@
    ·
    - {{u.id}} + #{{u.id}}
    {% endif %} From 7e84d17a7595e160045c141b92e839dd71ecbd2e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 23:16:34 -0600 Subject: [PATCH 130/132] fix --- files/templates/CHRISTMAS/comments/CommentActions.html | 2 +- files/templates/CHRISTMAS/modals/ModalCommentActions.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/comments/CommentActions.html b/files/templates/CHRISTMAS/comments/CommentActions.html index e7368099c..4f4d5714d 100644 --- a/files/templates/CHRISTMAS/comments/CommentActions.html +++ b/files/templates/CHRISTMAS/comments/CommentActions.html @@ -118,7 +118,7 @@ {% endif %} {% endif %} - {% if v and v.admin_level==6 and v.id==c.author_id %} + {% if v and v.admin_level > 0 and v.id==c.author_id %} {% endif %} {% if v %} - {% if v.admin_level>=1 and v.id==c.author_id %} + {% if v.admin_level > 0 and v.id==c.author_id %}
    • - {% if v.id != u.id %}
  • Custom flair
    • - {% endif %}
    From 4897392b1204185fab004360bf01892e17286447 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 27 Dec 2021 23:22:44 -0600 Subject: [PATCH 132/132] fix --- files/templates/CHRISTMAS/sidebars/ProfileSidebar.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html index e423cc399..4233409cb 100644 --- a/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html +++ b/files/templates/CHRISTMAS/sidebars/ProfileSidebar.html @@ -66,6 +66,7 @@ Danger Zone
      + {% if v.admin_level > 2 %}
    • Meme Moderator Status
      • + {% endif %}
    • Agendaposter Mode
      • + {% if u.admin_level > 1 %}
    • Damage Control
      • + {% endif %} {% if v.admin_level > 2 and u.admin_level > 2 %}
    • Admin Persmissions