From cd727759941212c4d8cdf6251d17214fbfac99bf Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 13:03:24 -0600 Subject: [PATCH 001/399] fix comment pins --- .../CHRISTMAS/comments/CommentActions.html | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/files/templates/CHRISTMAS/comments/CommentActions.html b/files/templates/CHRISTMAS/comments/CommentActions.html index 4f4d5714d..d0cc9d498 100644 --- a/files/templates/CHRISTMAS/comments/CommentActions.html +++ b/files/templates/CHRISTMAS/comments/CommentActions.html @@ -153,16 +153,28 @@

  • - - + {% if v.admin_level > 1 %} + + + {% elif v.id == c.post.author_id %} + + {% endif %} {% if v and v.admin_level > 1 %} From 6d6271030896f82f51c3bca38425602956d44e95 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 15:23:37 -0600 Subject: [PATCH 002/399] fix --- files/templates/CHRISTMAS/comments/CommentActions.html | 1 + 1 file changed, 1 insertion(+) diff --git a/files/templates/CHRISTMAS/comments/CommentActions.html b/files/templates/CHRISTMAS/comments/CommentActions.html index d0cc9d498..76eb7028e 100644 --- a/files/templates/CHRISTMAS/comments/CommentActions.html +++ b/files/templates/CHRISTMAS/comments/CommentActions.html @@ -175,6 +175,7 @@ Pin + {% endif %} {% endif %} {% if v and v.admin_level > 1 %} From 41f8ed0fe929c45ebf19cfaa1330be1c06ac828b Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 18:35:19 -0600 Subject: [PATCH 003/399] fix --- .../CHRISTMAS/comments/CommentActions.html | 2 +- .../CHRISTMAS/modals/ModalCommentActions.html | 35 +++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/files/templates/CHRISTMAS/comments/CommentActions.html b/files/templates/CHRISTMAS/comments/CommentActions.html index 76eb7028e..f6de23d68 100644 --- a/files/templates/CHRISTMAS/comments/CommentActions.html +++ b/files/templates/CHRISTMAS/comments/CommentActions.html @@ -149,7 +149,7 @@ {% endif %} - {% if v and c.post and (v.admin_level > 1 or v.id == c.post.author_id) %} + {% if v and c.post %}

  • diff --git a/files/templates/CHRISTMAS/modals/ModalCommentActions.html b/files/templates/CHRISTMAS/modals/ModalCommentActions.html index c1a0c17ec..54a2422fc 100644 --- a/files/templates/CHRISTMAS/modals/ModalCommentActions.html +++ b/files/templates/CHRISTMAS/modals/ModalCommentActions.html @@ -68,17 +68,30 @@ {% endif %} {% endif %} - {% if v and c.post and (v.admin_level > 1 or v.id == c.post.author_id) %} -
  • - -
  • -
  • - -
  • + {% if v and c.post %} + {% if v.admin_level > 1 %} +
  • + +
  • +
  • + +
  • + {% elif v.id == c.post.author_id %} +
  • + +
  • +
  • + +
  • + {% endif %} {% endif %} {% if v %} {% if v.admin_level > 0 and v.id==c.author_id %} From 450d4164b7efffa1704c66afcc868322952b8de2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 18:36:23 -0600 Subject: [PATCH 004/399] 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 b97d4c9e1..f1f64c295 100644 --- a/files/templates/CHRISTMAS/header-tw.html +++ b/files/templates/CHRISTMAS/header-tw.html @@ -145,7 +145,7 @@ {% if v.admin_level > 1 %} - + Admin tools From 13ce7e78154c9117b6358a21c21d650d120bd804 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 18:40:03 -0600 Subject: [PATCH 005/399] fix --- files/static/dist/main.css | 51 ++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 4d4a84785..3950164be 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -1019,18 +1019,15 @@ video { .mr-auto { margin-right: auto; } -.mr-4 { - margin-right: 1rem; -} .mt-4 { margin-top: 1rem; } +.mr-4 { + margin-right: 1rem; +} .mb-4 { margin-bottom: 1rem; } -.mb-6 { - margin-bottom: 1.5rem; -} .mr-0 { margin-right: 0px; } @@ -1040,6 +1037,9 @@ video { .mt-auto { margin-top: auto; } +.mb-6 { + margin-bottom: 1.5rem; +} .mb-auto { margin-bottom: auto; } @@ -1133,15 +1133,15 @@ video { .h-6 { height: 1.5rem; } +.h-56 { + height: 14rem; +} .h-\[10px\] { height: 10px; } .h-8 { height: 2rem; } -.h-56 { - height: 14rem; -} .h-48 { height: 12rem; } @@ -1623,14 +1623,14 @@ video { .bg-transparent { background-color: transparent; } -.bg-gray-100 { - --tw-bg-opacity: 1; - background-color: rgba(var(--color-100), var(--tw-bg-opacity)); -} .bg-white { --tw-bg-opacity: 1; background-color: rgba(255, 255, 255, var(--tw-bg-opacity)); } +.bg-gray-100 { + --tw-bg-opacity: 1; + background-color: rgba(var(--color-100), var(--tw-bg-opacity)); +} .bg-gray-200 { --tw-bg-opacity: 1; background-color: rgba(var(--color-200), var(--tw-bg-opacity)); @@ -3354,6 +3354,11 @@ video { color: rgba(255, 255, 255, var(--tw-text-opacity)); } +.hover\:text-yellow-400:hover { + --tw-text-opacity: 1; + color: rgba(251, 191, 36, var(--tw-text-opacity)); +} + .hover\:text-green-700:hover { --tw-text-opacity: 1; color: rgba(21, 128, 61, var(--tw-text-opacity)); @@ -3681,6 +3686,11 @@ video { color: rgba(var(--color-500), var(--tw-text-opacity)); } +.dark .dark\:text-yellow-700 { + --tw-text-opacity: 1; + color: rgba(180, 83, 9, var(--tw-text-opacity)); +} + .dark .dark\:text-gray-300 { --tw-text-opacity: 1; color: rgba(var(--color-300), var(--tw-text-opacity)); @@ -3706,6 +3716,11 @@ video { color: rgba(var(--color-400), var(--tw-text-opacity)); } +.dark .dark\:hover\:text-yellow-600:hover { + --tw-text-opacity: 1; + color: rgba(217, 119, 6, var(--tw-text-opacity)); +} + .dark .dark\:focus\:bg-transparent:focus { background-color: transparent; } @@ -3788,15 +3803,15 @@ video { padding-right: 0px; } - .sm\:text-lg { - font-size: 1.125rem; - line-height: 1.75rem; - } - .sm\:text-base { font-size: 1rem; line-height: 1.5rem; } + + .sm\:text-lg { + font-size: 1.125rem; + line-height: 1.75rem; + } } @media (min-width: 768px) { From c52b1be309a0c8b429a3f303e576ffd35df65a57 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 18:48:15 -0600 Subject: [PATCH 006/399] fix --- files/templates/CHRISTMAS/userpage.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index fe6824b93..bf9702977 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -4,9 +4,6 @@ {% block title %} - {{u.username}}'s profile - {{'SITE_NAME' | app_config}} {% if u.is_private %} @@ -28,6 +25,10 @@ + +{% if u and u.profilecss and (u.admin_level or not (v and v.admin_level)) %} + +{% endif %} {% endblock %} {% block subHeader %} From 03515f35e50b0c8f8d7eb4e909fe91eaa0d3ba3e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Thu, 30 Dec 2021 18:52:28 -0600 Subject: [PATCH 007/399] fix --- files/templates/CHRISTMAS/admin/image_posts.html | 2 +- files/templates/CHRISTMAS/header-tw.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/admin/image_posts.html b/files/templates/CHRISTMAS/admin/image_posts.html index a26e5feb9..a996a64fa 100644 --- a/files/templates/CHRISTMAS/admin/image_posts.html +++ b/files/templates/CHRISTMAS/admin/image_posts.html @@ -1,4 +1,4 @@ -{% extends "CHRISTMAS/userpage.html" %} +{% extends "CHRISTMAS/settings2.html" %} {% block adminpanel %}{% endblock %} {% block pagetype %}userpage{% endblock %} diff --git a/files/templates/CHRISTMAS/header-tw.html b/files/templates/CHRISTMAS/header-tw.html index f1f64c295..7a7f36351 100644 --- a/files/templates/CHRISTMAS/header-tw.html +++ b/files/templates/CHRISTMAS/header-tw.html @@ -63,7 +63,6 @@ ] %} -