From 7c0ebd7487df28513224e9ac6bbde6f89341afa5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:32:50 -0600 Subject: [PATCH 02/67] fix --- files/templates/CHRISTMAS/userpage.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 59e34e6e1e..527de1f144 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -444,7 +444,7 @@ {% endif %} {% if u.song %} - --> {% endif %} - + {% endblock %} \ No newline at end of file From de5b1f9c1b479718083d2a90fb9cafcc67993aa1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:33:08 -0600 Subject: [PATCH 03/67] fix --- files/templates/CHRISTMAS/userpage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 527de1f144..1b96d9f051 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -405,7 +405,7 @@ {% block scripts %} {% if v %} - --> {% endif %} {% if u.song %} From 43b045426f8724b28b7eeaee236e1fe41a5e7638 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:33:45 -0600 Subject: [PATCH 04/67] fix --- files/templates/CHRISTMAS/userpage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 1b96d9f051..40eb5ade4e 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -382,8 +382,8 @@ {% if u.song and v and v.mute and not u.unmutable %} - Pause anthem - + {% endif %} {% endblock %} From f21c6e62cf49d27d8e96b4106026ae61962ed136 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:34:50 -0600 Subject: [PATCH 05/67] fix --- files/templates/CHRISTMAS/userpage.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 40eb5ade4e..59e34e6e1e 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -382,8 +382,8 @@ {% if u.song and v and v.mute and not u.unmutable %} - + Pause anthem + {% endif %} {% endblock %} @@ -405,7 +405,7 @@ {% block scripts %} {% if v %} - + {% endif %} {% if u.song %} - + {% endif %} - + {% endblock %} \ No newline at end of file From fe015bd11f62e475f26b73a4218c7557c913bd81 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:35:36 -0600 Subject: [PATCH 06/67] 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 1d4f064fef..83aec9baad 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 4353527632d53465ad8085ce3dbe57302f259584 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:37:28 -0600 Subject: [PATCH 07/67] fix --- files/templates/CHRISTMAS/userpage.html | 86 ------------------------- 1 file changed, 86 deletions(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 5679235ed5..045adc470d 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -390,90 +390,4 @@ {% block sidebar %} {% include "CHRISTMAS/sidebars/ProfileSidebar.html" %} -{% endblock %} - -{% block modals %} -{% if v %} - {% include "CHRISTMAS/emoji_modal.html" %} - {% include "CHRISTMAS/gif_modal.html" %} - {% include "CHRISTMAS/modals/ModalGiftCoins.html" %} - {% if v.admin_level > 1 %} - {% include "CHRISTMAS/modals/ModalAdminManageUser.html" %} - {% endif %} -{% endif %} -{% endblock %} - -{% block scripts %} -{% if v %} - -{% endif %} - -{% if u.song %} - -{% endif %} - - {% endblock %} \ No newline at end of file From 29632513806ee9e578b6a922417ace0150885929 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:37:46 -0600 Subject: [PATCH 08/67] fix --- files/templates/CHRISTMAS/userpage.html | 76 +++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 045adc470d..61fca86908 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -390,4 +390,80 @@ {% block sidebar %} {% include "CHRISTMAS/sidebars/ProfileSidebar.html" %} +{% endblock %} + + +{% block scripts %} +{% if v %} + +{% endif %} + +{% if u.song %} + +{% endif %} + + {% endblock %} \ No newline at end of file From c2168b2ed0413bdfee65987536562991e205d58c Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:38:09 -0600 Subject: [PATCH 09/67] fix --- files/templates/CHRISTMAS/userpage.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 61fca86908..b341dac69a 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -392,6 +392,15 @@ {% include "CHRISTMAS/sidebars/ProfileSidebar.html" %} {% endblock %} +{% block modals %} +{% if v %} + {% include "CHRISTMAS/gif_modal.html" %} + {% include "CHRISTMAS/modals/ModalGiftCoins.html" %} + {% if v.admin_level > 1 %} + {% include "CHRISTMAS/modals/ModalAdminManageUser.html" %} + {% endif %} +{% endif %} +{% endblock %} {% block scripts %} {% if v %} From eb08a0b480dbee6a0e27a71a91e74454b0edb3b1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:38:25 -0600 Subject: [PATCH 10/67] 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 b341dac69a..3bc60f50cc 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -394,8 +394,8 @@ {% block modals %} {% if v %} + {% include "CHRISTMAS/emoji_modal.html" %} {% include "CHRISTMAS/gif_modal.html" %} - {% include "CHRISTMAS/modals/ModalGiftCoins.html" %} {% if v.admin_level > 1 %} {% include "CHRISTMAS/modals/ModalAdminManageUser.html" %} {% endif %} From fa0973096e98ffcc5612920a1b914854f49e5423 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:38:44 -0600 Subject: [PATCH 11/67] fix --- files/templates/CHRISTMAS/userpage.html | 1 + 1 file changed, 1 insertion(+) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index 3bc60f50cc..5679235ed5 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -396,6 +396,7 @@ {% if v %} {% include "CHRISTMAS/emoji_modal.html" %} {% include "CHRISTMAS/gif_modal.html" %} + {% include "CHRISTMAS/modals/ModalGiftCoins.html" %} {% if v.admin_level > 1 %} {% include "CHRISTMAS/modals/ModalAdminManageUser.html" %} {% endif %} From 22f58ac91f0249b6f46ec96cfc0cfe9577d081f2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:39:05 -0600 Subject: [PATCH 12/67] fix --- files/templates/CHRISTMAS/modals/ModalGiftCoins.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html index 393c6d5fe0..3eeefd1f42 100644 --- a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html +++ b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html @@ -20,7 +20,7 @@ {% endif %} -
+
    From 62057b5b1f6344697d8381b41bc3fc8a1288f3fa Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:56:50 -0600 Subject: [PATCH 13/67] fix --- files/templates/CHRISTMAS/submission_listing.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html index a94a10fcf7..6ae18422e5 100644 --- a/files/templates/CHRISTMAS/submission_listing.html +++ b/files/templates/CHRISTMAS/submission_listing.html @@ -45,7 +45,7 @@
{% endif %} -
  • +
  • @@ -260,26 +260,26 @@
    {% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %} - + {% elif not p.url %} - + {% elif p.is_image %} - + {% elif p.is_video %} - post thumnail + post thumnail {% elif p.is_youtube %} - post thumnail + post thumnail {% else %} - + {% endif %}
    From ae2863e0990607ed05aa74fef6fbc2f10ddcc811 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:57:06 -0600 Subject: [PATCH 14/67] fix --- files/templates/CHRISTMAS/submission.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission.html b/files/templates/CHRISTMAS/submission.html index 7a3da00987..edbfc8c37e 100644 --- a/files/templates/CHRISTMAS/submission.html +++ b/files/templates/CHRISTMAS/submission.html @@ -319,7 +319,7 @@ {% if not p.is_image and p.thumb_url and not p.embed_url %} {% endif %} From df63f931f48d2e3244a18c1330fbad83993f6b2f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 20:58:00 -0600 Subject: [PATCH 15/67] fix --- files/static/dist/main.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index b4375d2643..5e53fd2d66 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -4063,8 +4063,8 @@ img.emoji-lg { width: 11rem; } - .md\:w-32 { - width: 8rem; + .md\:w-28 { + width: 7rem; } .md\:w-64 { @@ -4251,14 +4251,18 @@ img.emoji-lg { padding-left: 0px; } - .md\:pb-4 { - padding-bottom: 1rem; + .md\:pb-3\.5 { + padding-bottom: 0.875rem; } .md\:pt-0 { padding-top: 0px; } + .md\:pb-3 { + padding-bottom: 0.75rem; + } + .md\:pl-5 { padding-left: 1.25rem; } From 6a216a1244438ce5fd05c564e8075e754bbc8087 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 21:09:54 -0600 Subject: [PATCH 16/67] fix --- files/templates/CHRISTMAS/header-tw.html | 159 +++++++++++------------ 1 file changed, 79 insertions(+), 80 deletions(-) diff --git a/files/templates/CHRISTMAS/header-tw.html b/files/templates/CHRISTMAS/header-tw.html index 82e1122557..815c6b1a00 100644 --- a/files/templates/CHRISTMAS/header-tw.html +++ b/files/templates/CHRISTMAS/header-tw.html @@ -5,35 +5,7 @@
    - {% if not error %} -
    - - -
    - {% endif %} -
    +
    @@ -122,6 +94,33 @@ Sign up {% endif %} + + {% if not error %} + + + {% endif %}
    {% endif %}
    @@ -131,9 +130,9 @@
    - logo - - rdrama + logo + + rdrama -
  • - -
  • - - {% else %} - - {% endif %} - - artwork featuring an orange and white cat - - +
  • + +
  • + + {% else %} + + {% endif %} + + artwork featuring an orange and white cat + + +
    - - \ No newline at end of file + \ No newline at end of file From 8b34be6aa39502109bbaf192c660082ef2ad8816 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 21:10:23 -0600 Subject: [PATCH 17/67] fix --- files/templates/CHRISTMAS/header-tw.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/header-tw.html b/files/templates/CHRISTMAS/header-tw.html index 815c6b1a00..0536bca12f 100644 --- a/files/templates/CHRISTMAS/header-tw.html +++ b/files/templates/CHRISTMAS/header-tw.html @@ -127,7 +127,7 @@ -
    + {% if not error %} -
    +
    {% if v %} @@ -55,18 +55,18 @@
    {% if v.admin_level > 1 %} -
    + Admin tools {% endif %} - + My profile - + View notifications
    @@ -97,7 +97,7 @@ {% if not error %} -
    -