From 5717125ea0129b0900d0c6ce7d72e5ec96e3cacd Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:39:22 -0600 Subject: [PATCH 001/275] fix --- .../templates/CHRISTMAS/settings_filters.html | 7 + .../CHRISTMAS/submission/SubmissionList.html | 6 + .../CHRISTMAS/submission_listing_compact.html | 410 ++++++++++++++++++ 3 files changed, 423 insertions(+) create mode 100644 files/templates/CHRISTMAS/submission/SubmissionList.html create mode 100644 files/templates/CHRISTMAS/submission_listing_compact.html diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index fa0c9967f3..6d0c482792 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -40,6 +40,13 @@ +

+ +
+ + +
+

Card view

diff --git a/files/templates/CHRISTMAS/submission/SubmissionList.html b/files/templates/CHRISTMAS/submission/SubmissionList.html new file mode 100644 index 0000000000..ff5b32c06a --- /dev/null +++ b/files/templates/CHRISTMAS/submission/SubmissionList.html @@ -0,0 +1,6 @@ + +{% if v and v.compact %} + {% include "CHRISTMAS/submission_listing.html" %} +{% else %} + {% include "CHRISTMAS/submission_listing_compact.html" %} +{% endif %} \ No newline at end of file diff --git a/files/templates/CHRISTMAS/submission_listing_compact.html b/files/templates/CHRISTMAS/submission_listing_compact.html new file mode 100644 index 0000000000..cf53e5e7d2 --- /dev/null +++ b/files/templates/CHRISTMAS/submission_listing_compact.html @@ -0,0 +1,410 @@ +{% if v %} + {% include "CHRISTMAS/award_modal.html" %} +{% endif %} + +{% for p in listing %} + +{% set ups=p.upvotes %} +{% set downs=p.downvotes %} +{% set score=ups-downs %} + +{% if v %} + {% set voted= p.voted %} +{% else %} + {% set voted=-2 %} +{% endif %} + +{% if request.host == 'pcmemes.net' %} + {% set cc='SPLASH MOUNTAIN' %} +{% else %} + {% set cc='COUNTRY CLUB' %} +{% endif %} + +{% if p.active_flags %} + +{% endif %} + +
  • + +
    + + + +
    + +
    + +
    + {{ p.author.username }} avatar +
    + + {% if p.author.shadowbanned or p.distinguish_level or p.is_bot or p.is_blocking or p.is_blocked or p.author.verified %} + + {% if v and v.admin_level==6 and p.author.shadowbanned %} + + {% endif %} + {% if p.distinguish_level %} + + {% endif %} + {% if p.is_bot %} + + {% endif %} + {% if p.is_blocking %} + + {% endif %} + {% if p.is_blocked %} + + {% endif %} + {% if p.author.verified %} + + {% endif %} + + {% endif %} + + {% if not p.award_count('ghosts') %} + + + + {% if p.author.patron and not p.distinguish_level %} + + {{p.author.username}} + + {% elif p.distinguish_level and request.host == 'rdrama.net' %} + + {{p.author.username}} + + {% else %} + {{p.author.username}} + {% endif %} + + + + {% if p.author.customtitle %} + + {% if p.author.quadrant %} + + {% endif %} + {{p.author.customtitle | safe}} + + {% endif %} + {% endif %} + + {{p.age_string}} + + + {% if p.edited_utc %} + Edited + {{p.edited_string}} + + {% endif %} + + {% if p.is_image %} + (image post) + {% elif p.is_video %} + (video post) + {% elif p.realurl(v) %} + + ({{p.domain}}) + + {% else %} + (text post) + {% endif %} + + {% if p.active_flags %} + + {% endif %} + + {% if p.bannedfor and p.author.banned_by %} + + + + {% 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 and (p.stickied.startswith('t:') or p.stickied.startswith('j:')) %} +
    • + + + Pinned + +
      • + {% elif p.stickied %} +
    • + + + Pinned + +
      • + {% endif %} + + {% if p.private %} +
    • + + + Draft + +
      • + {% endif %} + + {% if p.awards %} + {% for a in p.awards %} +
    • + +
      • + {% endfor %} + {% endif %} +
    + {% endif %} +
    + +
    + + {{p.realtitle(v) | safe}} + +
    + + {% if p.realbody(v) and not p.over_18 %} +
    + {{p.realbody(v) | safe}} +
    + {% endif %} + + +
    + +
    + {% 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 + + {% elif p.is_youtube %} + + post thumnail + + {% else %} + + + + {% endif %} +
    + +
    + +{% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %} +
    + + Post preview + +
    +{% endif %} + +{% if not p.club or v and (v.paid_dues or v.id == p.author_id) and (p.is_video or p.is_youtube) %} +
    + {% if p.is_video %} +
    + +
    + {% elif p.is_youtube %} +
    + {{p.embed_url | safe}} +
    + {% endif %} +
    +{% endif %} + +
    + {% include "CHRISTMAS/submission/SubmissionActionsMobile.html" %} +
    + +{% include "CHRISTMAS/modals/ModalSubmissionActions.html" %} + +
    • + +{% else %} + +{% if request.path.endswith('/admin/queue') %} + +
    +
    +
    +
    This queue is empty. (That's a good thing.)
    +
    +
    +
    + + +{% elif u %} +{% if v and v.id == u.id %} +
    +
    +
    + + + + +

    You haven't {% if "saved" in request.full_path %}saved{% else %}made{% endif %} a post yet

    +

    Your {% if "saved" in request.full_path %}saved posts{% else %}posting history{% endif %} will show here.

    + {% if "saved" not in request.full_path %}Create a post{% endif %} +
    +
    +
    + + +{% else %} +
    +
    +
    + + + + +

    @{{u.username}} hasn't made a post yet

    +

    Their posting history will show here.

    + 
    +
    +
    +
    +
    +{% endif %} + +{% else %} +
    + +

    No posts here -_-

    +

    + Looks like there is no content atm. +

    +
    +{% endif %} + +{% endfor %} + +{% if v %} + {% include "CHRISTMAS/delete_post_modal.html" %} + {% include "CHRISTMAS/report_post_modal.html" %} + {% if v.admin_level == 6 %} + {% include "CHRISTMAS/ban_modal.html" %} + {% endif %} +{% endif %} + +{% include "CHRISTMAS/expanded_image_modal.html" %} + + + + + \ No newline at end of file From bb9badfe2ba02411caa5e2927733578dbfe6ba05 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:40:14 -0600 Subject: [PATCH 002/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index 6d0c482792..e545957eff 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -40,7 +40,10 @@
    -

    +

    + Compact mode + New! +

    From 236110fe0358d0b2bc5f9d02a50885e752997625 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:40:30 -0600 Subject: [PATCH 003/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index e545957eff..75088c03dd 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -29,7 +29,7 @@

    Highlight New Comments

    -
    +
    From 494f37e3060e8a36ec0ba86b5213b5f4425885fb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:43:30 -0600 Subject: [PATCH 004/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index 75088c03dd..f953e45461 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -45,8 +45,8 @@ New! -
    - +
    +
    From dcaf89e565d7e2360c34771bdb40c9103f4a0c00 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:44:03 -0600 Subject: [PATCH 005/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index f953e45461..c9d684554d 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -46,7 +46,7 @@
    - +
    From 80b92f6c368bdac42570ec290d079c3dff50a2e7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:45:12 -0600 Subject: [PATCH 006/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index c9d684554d..070b0caddb 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -46,7 +46,7 @@
    - +
    From 21308779c55570c9794cbeb65681a9e0506de450 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:46:33 -0600 Subject: [PATCH 007/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index 070b0caddb..108d2fa483 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -46,7 +46,7 @@
    - +
    From 8b5faf2007a955c0af1e8defd162828bed47ca89 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:50:37 -0600 Subject: [PATCH 008/275] fix --- files/routes/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/settings.py b/files/routes/settings.py index 20d86ca391..160045aaef 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -100,7 +100,7 @@ def settings_profile_post(v): elif request.values.get("compact", v.compact) != v.compact: updated = True - v.teddit = request.values.get("compact", None) == 'true' + v.compact = request.values.get("compact", None) == 'true' elif request.values.get("nitter", v.nitter) != v.nitter: updated = True From 637e1a82f8692475cd9d31e0a07b0f74def4e0a2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:52:21 -0600 Subject: [PATCH 009/275] fix --- files/templates/CHRISTMAS/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/settings_filters.html b/files/templates/CHRISTMAS/settings_filters.html index 108d2fa483..96621293d2 100644 --- a/files/templates/CHRISTMAS/settings_filters.html +++ b/files/templates/CHRISTMAS/settings_filters.html @@ -46,7 +46,7 @@
    - +
    From c3d84a89033fa534f6b4a3173cc5097517c418e4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:53:04 -0600 Subject: [PATCH 010/275] fix --- files/templates/CHRISTMAS/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/home.html b/files/templates/CHRISTMAS/home.html index c5948cd583..aa8ab92f13 100644 --- a/files/templates/CHRISTMAS/home.html +++ b/files/templates/CHRISTMAS/home.html @@ -28,7 +28,7 @@
      - {% include "CHRISTMAS/submission_listing.html" %} + {% include "CHRISTMAS/submisson/SubmissionList.html" %}
    {% if listing %} From b4edfdf882e254f3b092eb035d3c18be927990af Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:54:06 -0600 Subject: [PATCH 011/275] fix --- files/templates/CHRISTMAS/submission/SubmissionList.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/submission/SubmissionList.html b/files/templates/CHRISTMAS/submission/SubmissionList.html index ff5b32c06a..1d04a77624 100644 --- a/files/templates/CHRISTMAS/submission/SubmissionList.html +++ b/files/templates/CHRISTMAS/submission/SubmissionList.html @@ -1,6 +1,6 @@ {% if v and v.compact %} - {% include "CHRISTMAS/submission_listing.html" %} -{% else %} {% include "CHRISTMAS/submission_listing_compact.html" %} +{% else %} + {% include "CHRISTMAS/submission_listing.html" %} {% endif %} \ No newline at end of file From 9f8138cf161cad8c5dacc8b35a53506dda4f2a94 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:54:58 -0600 Subject: [PATCH 012/275] fix --- files/templates/CHRISTMAS/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/home.html b/files/templates/CHRISTMAS/home.html index aa8ab92f13..f986457a25 100644 --- a/files/templates/CHRISTMAS/home.html +++ b/files/templates/CHRISTMAS/home.html @@ -28,7 +28,7 @@
      - {% include "CHRISTMAS/submisson/SubmissionList.html" %} + {% include "CHRISTMAS/submission/SubmissionList.html" %}
    {% if listing %} From 6b503dd13084009a8978ff45848e1c8a8e48caf9 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 15:55:32 -0600 Subject: [PATCH 013/275] fix --- files/templates/CHRISTMAS/submission_listing_compact.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/files/templates/CHRISTMAS/submission_listing_compact.html b/files/templates/CHRISTMAS/submission_listing_compact.html index cf53e5e7d2..ff7f81c8c2 100644 --- a/files/templates/CHRISTMAS/submission_listing_compact.html +++ b/files/templates/CHRISTMAS/submission_listing_compact.html @@ -50,9 +50,6 @@
    -
    +
    {{p.realtitle(v) | safe}} From 7bdc49c12d960f26910227ce8b299c7989b7085c Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 16:45:47 -0600 Subject: [PATCH 055/275] fix --- files/templates/CHRISTMAS/submission_listing_compact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission_listing_compact.html b/files/templates/CHRISTMAS/submission_listing_compact.html index 18f6339007..054e737e0b 100644 --- a/files/templates/CHRISTMAS/submission_listing_compact.html +++ b/files/templates/CHRISTMAS/submission_listing_compact.html @@ -307,7 +307,7 @@
    {% endif %} -
    +
    {% include "CHRISTMAS/submission/SubmissionActionsMobile.html" %}
    From c0587e7f8d1792c5c177dc4e76cf0661145b81d9 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:02:58 -0600 Subject: [PATCH 056/275] fix --- files/templates/CHRISTMAS/submission_listing_compact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/submission_listing_compact.html b/files/templates/CHRISTMAS/submission_listing_compact.html index 054e737e0b..71a2390930 100644 --- a/files/templates/CHRISTMAS/submission_listing_compact.html +++ b/files/templates/CHRISTMAS/submission_listing_compact.html @@ -239,7 +239,7 @@
    - + {{p.realtitle(v) | safe}}
    From 22ace2dfef9a3038417424ca91919301dbbaba3f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:31:06 -0600 Subject: [PATCH 057/275] fix --- files/templates/CHRISTMAS/leaderboard.html | 41 ++++++++++++++++++++++ files/templates/CHRISTMAS/marseys.html | 28 +++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 files/templates/CHRISTMAS/marseys.html diff --git a/files/templates/CHRISTMAS/leaderboard.html b/files/templates/CHRISTMAS/leaderboard.html index 6e51fd1eb1..0ba4b0f7a7 100644 --- a/files/templates/CHRISTMAS/leaderboard.html +++ b/files/templates/CHRISTMAS/leaderboard.html @@ -363,4 +363,45 @@ {% endfor %}
    +{% if users13 %} +
    +
    +

    + rDrama's 25 Biggest Marsey Artists +

    +
    +
    + {% for user in users13 %} +
    + +

    + {{loop.index}} +

    +
    + {{ user[0].username }} avatar + {% if loop.index == 1 %} + + {% endif %} +
    + +
    + + {{user[0].username}} + + {% if user[0].customtitle %} +

    + {{user[0].customtitle | safe}} +

    + {% endif %} +
    +
    + + {{user[1]}} + +
    +
    + {% endfor %} +
    +
    +{% endif %} {% endblock %} \ No newline at end of file diff --git a/files/templates/CHRISTMAS/marseys.html b/files/templates/CHRISTMAS/marseys.html new file mode 100644 index 0000000000..9d687609ca --- /dev/null +++ b/files/templates/CHRISTMAS/marseys.html @@ -0,0 +1,28 @@ +{% extends "default.html" %} +{% block content %} +
    +
+	
+
    +
    + + + + + + + + + +{% for marsey, author in marseys %} + + + + + + +{% endfor %} + +
    #NameMarseyAuthor
    {{loop.index}}{{marsey}}:{{marsey}}:{% if author in ('anton-d','unknown') %}{{author}}{% else %}@{{author}}'s profile picture{{author}}{% endif %}
    + +{% endblock %} \ No newline at end of file From d8c72f324cd6e4af944a5b5f6f7b76dd2c1fc58d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:32:06 -0600 Subject: [PATCH 058/275] fix --- files/templates/CHRISTMAS/marseys.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/marseys.html b/files/templates/CHRISTMAS/marseys.html index 9d687609ca..2876e1ef75 100644 --- a/files/templates/CHRISTMAS/marseys.html +++ b/files/templates/CHRISTMAS/marseys.html @@ -1,4 +1,4 @@ -{% extends "default.html" %} +{% extends "/CHRISTMAS/default.html" %} {% block content %} 
     

From 371938c9b21e45b83a2002d025cbbdb78dfb9112 Mon Sep 17 00:00:00 2001
From: kek7198 
Date: Sun, 2 Jan 2022 17:32:34 -0600
Subject: [PATCH 059/275] fix

---
 files/templates/CHRISTMAS/marseys.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/CHRISTMAS/marseys.html b/files/templates/CHRISTMAS/marseys.html
index 2876e1ef75..cf6a6639d6 100644
--- a/files/templates/CHRISTMAS/marseys.html
+++ b/files/templates/CHRISTMAS/marseys.html
@@ -1,4 +1,4 @@
-{% extends "/CHRISTMAS/default.html" %}
+{% extends "CHRISTMAS/default.html" %}
 {% block content %}
 
     

From a08b9dfb6579dfb479c4ff415a418fcdaebd5a1c Mon Sep 17 00:00:00 2001
From: kek7198 
Date: Sun, 2 Jan 2022 17:35:16 -0600
Subject: [PATCH 060/275] fix

---
 files/templates/CHRISTMAS/leaderboard.html | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/files/templates/CHRISTMAS/leaderboard.html b/files/templates/CHRISTMAS/leaderboard.html
index 0ba4b0f7a7..94a4f47a14 100644
--- a/files/templates/CHRISTMAS/leaderboard.html
+++ b/files/templates/CHRISTMAS/leaderboard.html
@@ -385,13 +385,17 @@
    - - {{user[0].username}} - - {% if user[0].customtitle %} -

    - {{user[0].customtitle | safe}} -

    + {% if user[0]=='anton-d' %} + {{user[0]}} + {% else %} + + {{user[0].username}} + + {% if user[0].customtitle %} +

    + {{user[0].customtitle | safe}} +

    + {% endif %} {% endif %}
    From f10bb5f60b69afd1940eaf4fec1d954db5f4a60d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:37:17 -0600 Subject: [PATCH 061/275] fix --- files/templates/CHRISTMAS/leaderboard.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/leaderboard.html b/files/templates/CHRISTMAS/leaderboard.html index 94a4f47a14..e0271aa8b6 100644 --- a/files/templates/CHRISTMAS/leaderboard.html +++ b/files/templates/CHRISTMAS/leaderboard.html @@ -386,7 +386,9 @@
    {% if user[0]=='anton-d' %} - {{user[0]}} + + {{user[0]}} + {% else %} {{user[0].username}} From 86ebd3655946234f6b148ed68ef888111cae783a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:37:21 -0600 Subject: [PATCH 062/275] Update leaderboard.html --- files/templates/CHRISTMAS/leaderboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/leaderboard.html b/files/templates/CHRISTMAS/leaderboard.html index e0271aa8b6..3901b42852 100644 --- a/files/templates/CHRISTMAS/leaderboard.html +++ b/files/templates/CHRISTMAS/leaderboard.html @@ -386,7 +386,7 @@
    {% if user[0]=='anton-d' %} - + {{user[0]}} {% else %} From 8bf8b09643e6a99b8d40d3ac6e5a7f949e3fcd87 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:39:48 -0600 Subject: [PATCH 063/275] fix --- files/templates/CHRISTMAS/modals/ModalGiftCoins.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html index c39d1b0d2e..72db44deda 100644 --- a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html +++ b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html @@ -10,7 +10,7 @@
    {% if v.coins < 100 %} -
    +

    You need at least 100 dramacoin to send coins.

    @@ -49,8 +49,8 @@

    -
    - -
    From a1af4cf4c49ef848a4c8caf79ee527c01900dae2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:40:27 -0600 Subject: [PATCH 065/275] fix --- files/static/dist/main.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index e44b248426..8bd4efc2b2 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -3659,6 +3659,9 @@ code { .dark .dark\:bg-white\/10 { background-color: rgba(255, 255, 255, 0.1); } +.dark .dark\:bg-gray-700\/70 { + background-color: rgba(var(--color-700), 0.7); +} .dark .dark\:bg-gray-700\/40 { background-color: rgba(var(--color-700), 0.4); } @@ -3700,6 +3703,10 @@ code { --tw-text-opacity: 1; color: rgba(var(--color-400), var(--tw-text-opacity)); } +.dark .dark\:visited\:text-gray-300:visited { + --tw-text-opacity: 1; + color: rgba(var(--color-300), var(--tw-text-opacity)); +} .dark .dark\:hover\:bg-white\/10:hover { background-color: rgba(255, 255, 255, 0.1); } From 1bd05eb5695003e331a482fd1810d4cedae5768e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:41:09 -0600 Subject: [PATCH 066/275] 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 2f1be9dffe..4cf6633c55 100644 --- a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html +++ b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html @@ -10,7 +10,7 @@
    {% if v.coins < 100 %} -
    +

    You need at least 100 dramacoin to send coins.

    From 77e9d4c3a95737e1548303cba19ee1eb5e6e6b1d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:41:23 -0600 Subject: [PATCH 067/275] 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 8bd4efc2b2..9e2928697e 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -3659,8 +3659,8 @@ code { .dark .dark\:bg-white\/10 { background-color: rgba(255, 255, 255, 0.1); } -.dark .dark\:bg-gray-700\/70 { - background-color: rgba(var(--color-700), 0.7); +.dark .dark\:bg-gray-700\/90 { + background-color: rgba(var(--color-700), 0.9); } .dark .dark\:bg-gray-700\/40 { background-color: rgba(var(--color-700), 0.4); From 18c87a810777397ddaa0cca567085de0e905c73f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 17:42:47 -0600 Subject: [PATCH 068/275] fix --- files/templates/CHRISTMAS/userpage.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/files/templates/CHRISTMAS/userpage.html b/files/templates/CHRISTMAS/userpage.html index bf97029771..4ae3cbd7a1 100644 --- a/files/templates/CHRISTMAS/userpage.html +++ b/files/templates/CHRISTMAS/userpage.html @@ -69,6 +69,12 @@ {% endif %} {% if v.id != u.id %} +
  • + +
  • + +
    • \ No newline at end of file From 0f21bd1dadc7010c46d11d624d01409ead623fdb Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 20:26:56 -0600 Subject: [PATCH 127/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 2c0324c78b..686d7f4496 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -35,19 +35,19 @@ View - +
    - - +
    \ No newline at end of file From e577ac0a90506661ffe73fdf991512af389f3eb5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 20:27:36 -0600 Subject: [PATCH 128/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 686d7f4496..9e84321fa6 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -1,6 +1,6 @@
    - - {% include "CHRISTMAS/footer.html" %}
    From 194ec43977e17a0b538aa02739e1dbc317c62c96 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:31:28 -0600 Subject: [PATCH 151/275] 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 efcde1d359..a085b1e620 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From ce1f869124de0a5fcfaa7ff9a7e49bccdd448044 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:32:21 -0600 Subject: [PATCH 152/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 63a87fba92..a426a5ce6c 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,10 +45,11 @@ - + Message + test
    {% endif %}
    From 2ec96c8d308bc7cd920a07a2917cdeaf28a61cac Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:39:04 -0600 Subject: [PATCH 154/275] fix --- files/templates/CHRISTMAS/default.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index a085b1e620..099a27c0a0 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -306,7 +306,7 @@ {% block scripts %}{% endblock %} - + @@ -335,7 +335,7 @@ - + @@ -357,7 +357,7 @@ } {% endif %} - + From 76c18b8a946a4052695b20d549210f7b4c5aa798 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:39:56 -0600 Subject: [PATCH 155/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index a426a5ce6c..39323de7a3 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,11 +45,10 @@ - +
    {% endif %} From 639ce5a2d101a328d0f15aa952417600d5916c13 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:40:44 -0600 Subject: [PATCH 156/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 39323de7a3..b470ca19dd 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - From baa182b6dadae087e7f0aa11563c3a65ebf16e04 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:41:13 -0600 Subject: [PATCH 158/275] 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 099a27c0a0..e353ebe349 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 87990787d5ecb28d127f99438edcf6ee2e078e7d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:42:28 -0600 Subject: [PATCH 159/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index b470ca19dd..1414646d32 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - From afbe578e58bcaa65772ad90be0d89389af0c3d80 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:45:03 -0600 Subject: [PATCH 161/275] 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 e353ebe349..a6bd53ae9a 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 420874273ae6cdc4fda7073bd328520afb55a9ee Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:45:45 -0600 Subject: [PATCH 162/275] 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 a6bd53ae9a..cfea5119ef 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From fb5c241fd9b3961016a77d705224093390d45cc4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:48:25 -0600 Subject: [PATCH 163/275] 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 cfea5119ef..ffc76bbd4f 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From a104fb7ea5c26d8e0798742482ca98ec143dee84 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:49:01 -0600 Subject: [PATCH 164/275] 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 ffc76bbd4f..be18ba7dbb 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From d5269e29f94f96341721276351c805e197618e1a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:49:51 -0600 Subject: [PATCH 166/275] 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 be18ba7dbb..1cf19cb5fe 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From a28d05ae5b94c7d68611226fe3ae6ad53cb08691 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:53:06 -0600 Subject: [PATCH 168/275] Update default.html --- 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 1cf19cb5fe..74be692214 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From bfa07454cda8bfeff33db022c4d647f24de4090f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:54:22 -0600 Subject: [PATCH 169/275] 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 74be692214..12684f0959 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 6e4c2a9d7306f53656a4287133e293040310e1c4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:56:10 -0600 Subject: [PATCH 171/275] 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 12684f0959..1c8128a97e 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 67a516c04192d5dce1f61d0d951fd039973c270c Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 21:59:32 -0600 Subject: [PATCH 173/275] 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 1c8128a97e..de7656b31b 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From e09cedf040dc9b74486b77e4953e902967745378 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:00:26 -0600 Subject: [PATCH 174/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 4 ---- files/templates/CHRISTMAS/default.html | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 1414646d32..b3d703c14d 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,10 +45,6 @@ - {% endif %} diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index de7656b31b..0abdf8db3e 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -251,6 +251,12 @@ {% endblock %}
    + + +
    {% block searchText %} From 1cac55dc3c5d59d2be7de578bcce93ea65c693d5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:01:13 -0600 Subject: [PATCH 175/275] test --- 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 0abdf8db3e..35da240941 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -252,7 +252,7 @@
    - From 7d1e3d864031f50de79d8edaef116ae3646ae59d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:02:07 -0600 Subject: [PATCH 176/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 4 ++++ files/templates/CHRISTMAS/default.html | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index b3d703c14d..1414646d32 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,6 +45,10 @@ +
    {% endif %}
    diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index 35da240941..de7656b31b 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -251,12 +251,6 @@ {% endblock %}
    - - -
    {% block searchText %} From 07dbb0a528e59edd10b8a202867d7398b1be101c Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:10:36 -0600 Subject: [PATCH 177/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 6 +----- files/templates/CHRISTMAS/default.html | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 1414646d32..25c3903899 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -41,14 +41,10 @@ {% if v %} -
    +
    -
    {% endif %}
    diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index de7656b31b..bc195c1f91 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From e9d08126f77cb2ae3a9513436bbf1aba51977864 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:13:29 -0600 Subject: [PATCH 179/275] 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 bc195c1f91..70ff2ee3f4 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 9946472a7055fa660e7d020e0d34035ec76eb9cc Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:15:11 -0600 Subject: [PATCH 181/275] 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 70ff2ee3f4..e56843c596 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From fd536bdfbcf2d3ff9d94b9d2558570f8edf01393 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:15:36 -0600 Subject: [PATCH 182/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 25c3903899..a4f39df1b8 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,6 +45,10 @@ +
    {% endif %}
    From 2e7aa85346eb074b3ccf57c5384eee44a63712f6 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:17:26 -0600 Subject: [PATCH 183/275] 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 e56843c596..28808b984a 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 4f0f4ef13098391a15185dfe9260f7be7938d4f1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:19:36 -0600 Subject: [PATCH 184/275] 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 28808b984a..f56ef135c9 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 987827940646ec9a50dbb465fb1a6c888318deb9 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:22:36 -0600 Subject: [PATCH 185/275] 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 f56ef135c9..adc9007c85 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 8c8d53e8c00f3d9d2a767ca3c9565907a78aab52 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:24:22 -0600 Subject: [PATCH 187/275] Update default.html --- 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 adc9007c85..a402bc4e87 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From dcab5260bb76d38f7c07fe21b4001f24b8397206 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:26:43 -0600 Subject: [PATCH 188/275] 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 a402bc4e87..d421786058 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From c469ded2b8dbf0b6097c73f7e10dac89723371d1 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:32:09 -0600 Subject: [PATCH 190/275] 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 d421786058..cbe65932df 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 8d229fe0ce5dc2f8725e624c0325e28a2307dcf9 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:33:06 -0600 Subject: [PATCH 191/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index a4f39df1b8..2514f92459 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - From a09cd044da65800a84f375257cb8cd424cf789df Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:33:48 -0600 Subject: [PATCH 192/275] 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 cbe65932df..fe2150e12f 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 77cc49e7fb41166e7fd95d4578042688e229c116 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:36:39 -0600 Subject: [PATCH 193/275] 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 fe2150e12f..05612e0353 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 9d538595860faeb181172b7d32c24b90870f41fe Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:37:59 -0600 Subject: [PATCH 194/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- files/templates/CHRISTMAS/default.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 2514f92459..a4f39df1b8 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index 05612e0353..1b0acab9b1 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 867c84b28659082b18d69ed23c4fc61d3003a536 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:39:55 -0600 Subject: [PATCH 195/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index a4f39df1b8..03077d3482 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - From b1f984dc7ecd53683fdcd747aa5cea60da99614a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:40:01 -0600 Subject: [PATCH 196/275] 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 1b0acab9b1..d10210fe3c 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 6ed9350f9d51c21eeaae27c928ba26bf546f6835 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:41:09 -0600 Subject: [PATCH 197/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- files/templates/CHRISTMAS/default.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 03077d3482..e066788b03 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index d10210fe3c..60eac251c9 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 7873ef477d783e6f1315ec62a5b7c04fcb9f3ed6 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:42:35 -0600 Subject: [PATCH 198/275] 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 60eac251c9..150b492c93 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 650821989891fc14ee794f4e14c08fc9a1847f94 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:43:35 -0600 Subject: [PATCH 200/275] 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 150b492c93..578553ad62 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From bc1c597fef8a327654330907c3851ba14f1e0923 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:44:08 -0600 Subject: [PATCH 201/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index e066788b03..03077d3482 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -45,7 +45,7 @@ - From a7cbe7c8d98407f9f457736db16fcb6a6fe806ff Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 2 Jan 2022 22:49:10 -0600 Subject: [PATCH 202/275] fix --- files/templates/CHRISTMAS/ProfilePopover.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/ProfilePopover.html b/files/templates/CHRISTMAS/ProfilePopover.html index 03077d3482..e8f3521832 100644 --- a/files/templates/CHRISTMAS/ProfilePopover.html +++ b/files/templates/CHRISTMAS/ProfilePopover.html @@ -42,9 +42,9 @@ {% if v %}
    - +
    - + +
    diff --git a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html index 4cf6633c55..393c6d5fe0 100644 --- a/files/templates/CHRISTMAS/modals/ModalGiftCoins.html +++ b/files/templates/CHRISTMAS/modals/ModalGiftCoins.html @@ -20,7 +20,7 @@
    {% endif %} - +
      @@ -41,7 +41,7 @@
    - +

    From f34ad723f25038455e8014f5a6d5c164ee7b2b84 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 10:36:10 -0600 Subject: [PATCH 212/275] Update default.html --- 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 8a4a58593b..9849a0b6fb 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 72674567d5cb785509abc5bca893f3a06b9cd0d2 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 12:43:37 -0600 Subject: [PATCH 213/275] fix --- files/templates/CHRISTMAS/default.html | 2 +- files/templates/CHRISTMAS/modals/ModalDirectMessage.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html index 9849a0b6fb..4dbf82ee6f 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + diff --git a/files/templates/CHRISTMAS/modals/ModalDirectMessage.html b/files/templates/CHRISTMAS/modals/ModalDirectMessage.html index 7a6d713391..06ddd3fbf7 100644 --- a/files/templates/CHRISTMAS/modals/ModalDirectMessage.html +++ b/files/templates/CHRISTMAS/modals/ModalDirectMessage.html @@ -9,7 +9,7 @@

    -
    +
    @@ -37,7 +37,7 @@ -
    From a0046fbeb1ca62bc9799c88818896e4f2debd0f7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 12:44:49 -0600 Subject: [PATCH 214/275] fix --- files/templates/CHRISTMAS/modals/ModalDirectMessage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/modals/ModalDirectMessage.html b/files/templates/CHRISTMAS/modals/ModalDirectMessage.html index 06ddd3fbf7..605d823e16 100644 --- a/files/templates/CHRISTMAS/modals/ModalDirectMessage.html +++ b/files/templates/CHRISTMAS/modals/ModalDirectMessage.html @@ -37,7 +37,7 @@ -
    From 799362591886cf68f4e04021c71c6dc29d012b25 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 12:45:43 -0600 Subject: [PATCH 215/275] 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 4dbf82ee6f..54cc6ccd36 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 883040520fb06fac1ce2c4d6450495c7ef9e71de Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 12:50:10 -0600 Subject: [PATCH 216/275] 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 54cc6ccd36..8cbccd79b3 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From a251a05ba1ab4556c297d19c88d3a2310aa4d610 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 13:08:25 -0600 Subject: [PATCH 217/275] 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 8cbccd79b3..63ee7d5ba1 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From ca40f0dba65b449e2f507368454809c11e235f50 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 13:14:33 -0600 Subject: [PATCH 218/275] fix --- files/templates/CHRISTMAS/admin/admin_home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/CHRISTMAS/admin/admin_home.html b/files/templates/CHRISTMAS/admin/admin_home.html index 75b685001f..989b18496e 100644 --- a/files/templates/CHRISTMAS/admin/admin_home.html +++ b/files/templates/CHRISTMAS/admin/admin_home.html @@ -71,13 +71,13 @@ 'icon': 'fa-republican', 'title': 'Agenda Posters', 'description': 'Users with agenda poster mode', - 'link': '/admin/agendaposters' + 'link': '/agendaposters' }, { 'icon': 'fa-seedling', 'title': 'Grass Award', 'description': 'Users with active grass award', - 'link': '/admin/grassed' + 'link': '/grassed' }, { 'icon': 'fa-users', From 1db84ee73df7e3a2ee3a753363b9754c3d152be4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 13:36:50 -0600 Subject: [PATCH 219/275] fix --- files/templates/CHRISTMAS/modals/ModalDirectMessage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/CHRISTMAS/modals/ModalDirectMessage.html b/files/templates/CHRISTMAS/modals/ModalDirectMessage.html index 605d823e16..db83154567 100644 --- a/files/templates/CHRISTMAS/modals/ModalDirectMessage.html +++ b/files/templates/CHRISTMAS/modals/ModalDirectMessage.html @@ -37,7 +37,7 @@ -
    From 65f4dedb62f69676415527c11bb933061c150ef5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 14:55:21 -0600 Subject: [PATCH 220/275] 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 63ee7d5ba1..c945705122 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 0ac543cabb130c034defe0c872a43b4fea718b75 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:01:15 -0600 Subject: [PATCH 222/275] Update default.html --- 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 c945705122..1253773892 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 5c9705eea706efa5c8d1d14b166f1533b6b3734a Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:03:51 -0600 Subject: [PATCH 223/275] 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 1253773892..bec3ee8f6a 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From fa7525b9a69cedad2659432f3dd1acf1ecd3ee30 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:09:50 -0600 Subject: [PATCH 225/275] Update default.html --- 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 bec3ee8f6a..51e092a34c 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 7a728999216e46fc97353e724f565b032c220a4e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:10:50 -0600 Subject: [PATCH 226/275] 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 51e092a34c..9f5b84c7b0 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 28fdd4c866ce50786ca754b61c73a4bd6c6e62f4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:13:50 -0600 Subject: [PATCH 228/275] 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 9f5b84c7b0..0e21c894bd 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 88377174faacbd1b23f0fe5cababc0ecc8eacb5d Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:15:08 -0600 Subject: [PATCH 230/275] Update default.html --- 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 0e21c894bd..f9ce4647cf 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From c094b0e151275b1bc7938b9a7fabc54900c340bf Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:17:56 -0600 Subject: [PATCH 232/275] Update default.html --- 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 f9ce4647cf..d4941fb8a1 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From cd6127349d724e006dd85313d6bb23566fdbfbbd Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:25:06 -0600 Subject: [PATCH 234/275] Update default.html --- 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 d4941fb8a1..44da63f24c 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From f082577833c08f998f2eace870425e36e89131db Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:52:55 -0600 Subject: [PATCH 235/275] 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 44da63f24c..d37d8e940a 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From f2ce3d9da8380759661d509968f83febadff21f6 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:55:41 -0600 Subject: [PATCH 237/275] Update default.html --- 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 d37d8e940a..ec52831a02 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From e664150a6b3f55fa7398d7a7bb5c4f0a11d7ac84 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:59:08 -0600 Subject: [PATCH 238/275] 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 ec52831a02..e88480949c 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From d592f46e9996ca793569e5d6e6937be7ec18eaaa Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 15:59:30 -0600 Subject: [PATCH 239/275] 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 e88480949c..b78ff4c97f 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 5e528c72115575c788869bf4021997112f9f71be Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:03:19 -0600 Subject: [PATCH 240/275] 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 b78ff4c97f..e48d8463c3 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 00d2720e188b860edb5ed8ab249eb3329e73f01c Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:06:36 -0600 Subject: [PATCH 241/275] 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 e48d8463c3..66ddd6833f 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 238f9d0e9d22dd11f64e54184ad926adfd600fd9 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:08:29 -0600 Subject: [PATCH 243/275] Update default.html --- 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 66ddd6833f..88eec50ebc 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 3a413c56b05320ba69c91c6369fc248a6f4e028e Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:14:34 -0600 Subject: [PATCH 245/275] Update default.html --- 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 88eec50ebc..1dfd882c4e 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 5b923a2c84cf2f269b146d4348d7912d4930a1b9 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:19:37 -0600 Subject: [PATCH 246/275] test --- 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 1dfd882c4e..b12d120a68 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 501e9f1e0cb9cb29080881c2d64fe3c7cc9c05b7 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:21:09 -0600 Subject: [PATCH 248/275] Update default.html --- 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 b12d120a68..a1de642f8e 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 9cae87bf3a07a4a407892946570b1293ae9721c0 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:22:24 -0600 Subject: [PATCH 249/275] 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 a1de642f8e..7c0090deca 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From dd7a7c443b5dc3c4a8294cfc0f51bb1747a75b93 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:39:17 -0600 Subject: [PATCH 250/275] fxi --- 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 7c0090deca..74bb97bdb0 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From f4e4450f02e952bd5ecd2ab31948529420c425ab Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:41:06 -0600 Subject: [PATCH 252/275] 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 74bb97bdb0..7386328906 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 03f36148cd552e872cb481f73246b7c6f341c683 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:41:46 -0600 Subject: [PATCH 254/275] 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 7386328906..33bafbed35 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -357,7 +357,7 @@ } {% endif %} - + From 396c68e1a43d8227e55f85db0a97ddf26b624169 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:52:36 -0600 Subject: [PATCH 255/275] fix --- files/static/src/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/static/src/main.css b/files/static/src/main.css index 0518eaccb2..8d8f119ce4 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -250,7 +250,7 @@ } .theme-evergreen { - --color-primary: 220, 38, 38; + --color-primary: 82,124,144; --color-100: 244,246,244; --color-200: 229,235,231; --color-300: 209,219,213; From b74dedabbf93774e03b77b458291772f7fd6c265 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:52:39 -0600 Subject: [PATCH 256/275] fix --- files/static/dist/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index ba8057388d..472cc2f3be 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2860,7 +2860,7 @@ video { } .theme-evergreen { - --color-primary: 220, 38, 38; + --color-primary: 82,124,144; --color-100: 244,246,244; --color-200: 229,235,231; --color-300: 209,219,213; From 672e6da9f85686bc64671f1c41de98f16a392daf Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:54:15 -0600 Subject: [PATCH 257/275] fix --- files/static/dist/main.css | 2 +- files/static/src/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/static/dist/main.css b/files/static/dist/main.css index 472cc2f3be..0a10d504ee 100644 --- a/files/static/dist/main.css +++ b/files/static/dist/main.css @@ -2860,7 +2860,7 @@ video { } .theme-evergreen { - --color-primary: 82,124,144; + --color-primary: 87,138,157; --color-100: 244,246,244; --color-200: 229,235,231; --color-300: 209,219,213; diff --git a/files/static/src/main.css b/files/static/src/main.css index 8d8f119ce4..7618a4e7f0 100644 --- a/files/static/src/main.css +++ b/files/static/src/main.css @@ -250,7 +250,7 @@ } .theme-evergreen { - --color-primary: 82,124,144; + --color-primary: 87,138,157; --color-100: 244,246,244; --color-200: 229,235,231; --color-300: 209,219,213; From 176b9ec65a4ddc82670609c0d48ddb0184f4eb50 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:57:43 -0600 Subject: [PATCH 258/275] 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 33bafbed35..11b79c56a1 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 955c6b22120b212088d76a28b185bc3111da741f Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 16:58:29 -0600 Subject: [PATCH 259/275] 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 11b79c56a1..eb38c0511d 100644 --- a/files/templates/CHRISTMAS/default.html +++ b/files/templates/CHRISTMAS/default.html @@ -335,7 +335,7 @@ - + From 62e60ab4fb86cce99016508666644ec32625d2d5 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 17:00:58 -0600 Subject: [PATCH 260/275] fix --- files/templates/CHRISTMAS/comments.html | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/files/templates/CHRISTMAS/comments.html b/files/templates/CHRISTMAS/comments.html index 839e7d5002..58cbf255a2 100644 --- a/files/templates/CHRISTMAS/comments.html +++ b/files/templates/CHRISTMAS/comments.html @@ -495,29 +495,6 @@ text-shadow:-1px -1px 0 black,1px -1px 0 black,-1px 1px 0 black,1px 1px 0 black; } - .popover { - max-width: 50%; - box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); - border-color: #dadada; - } - - .popover-arrow { - display: none !important; - } - - .popover-user-profile { - display: flex; - flex-direction: column; - padding: 0; - background: var(--gray-600); - } - - .popover-body { - padding: 0; - border-radius: .25rem; - overflow: hidden; - } - .avatar-72 { width: 72px; height: 72px; From 6c4223678271a693ffe8fac9fa7a4492b93df207 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Mon, 3 Jan 2022 17:12:13 -0600 Subject: [PATCH 261/275] fix --- files/templates/CHRISTMAS/toasts/toasts.html | 27 ++++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/files/templates/CHRISTMAS/toasts/toasts.html b/files/templates/CHRISTMAS/toasts/toasts.html index 7cba26289e..60c3d1f196 100644 --- a/files/templates/CHRISTMAS/toasts/toasts.html +++ b/files/templates/CHRISTMAS/toasts/toasts.html @@ -1,16 +1,27 @@ +