From e00bf1f9a80be971cd8338cdf9f764b27102e36f Mon Sep 17 00:00:00 2001 From: justcool393 Date: Sun, 18 Sep 2022 03:19:37 -0700 Subject: [PATCH 1/3] fix images in slur replacer (#359) doesn't work with ALL CAPS TEXT, there's prolly a better way for this --- files/helpers/regex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/helpers/regex.py b/files/helpers/regex.py index 180546140a..55f916cd88 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -111,7 +111,7 @@ def sub_matcher(match, upper=False): return match.group(0) else: repl = SLURS[match.group(0).lower()] - return repl if not upper else repl.upper() + return repl if not upper or " Date: Sun, 18 Sep 2022 16:55:37 +0200 Subject: [PATCH 2/3] replace "np.reddit.com" (yikes) --- files/helpers/regex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/helpers/regex.py b/files/helpers/regex.py index 180546140a..5237046f8a 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -90,7 +90,7 @@ ascii_only_regex = re.compile("[ -~]+", flags=re.A) reddit_to_vreddit_regex = re.compile('(^|>|")https:\/\/old.reddit.com\/(r|u)\/', flags=re.A) -reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|new\.reddit.com|www\.reddit.com|i\.reddit\.com|libredd\.it|teddit\.net)\/(r|u)\/", flags=re.A) +reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|new\.reddit.com|np\.reddit.com|www\.reddit.com|i\.reddit\.com|libredd\.it|teddit\.net)\/(r|u)\/", flags=re.A) color_regex = re.compile("[a-z0-9]{6}", flags=re.A) From dbfac00555d3c9f5c068fe0676e9b844b4e54aca Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 18 Sep 2022 19:12:28 +0200 Subject: [PATCH 3/3] make shop nicer --- files/templates/hats.html | 29 +++++++++++++++++++++++++++++ files/templates/shop.html | 31 +++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/files/templates/hats.html b/files/templates/hats.html index 45768078dd..4a06aeb2e7 100644 --- a/files/templates/hats.html +++ b/files/templates/hats.html @@ -13,8 +13,37 @@ width: 80%; } } + + .shop-tab { + display: inline-flex; + max-width: 46.6%; + letter-spacing: 3px; + } + + .shop-tab.active { + background-color: var(--primary) !important; + pointer-events: none !important; + cursor: default !important; + } +
+
+
+
+
+ + AWARDS + + + HATS + +
+
+
+
+
+
hats banner
Number of hats you bought: {{v.num_of_owned_hats}}
diff --git a/files/templates/shop.html b/files/templates/shop.html index 6f34e51930..1192a60f8b 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -19,8 +19,37 @@ width: 80%; } } + + .shop-tab { + display: inline-flex; + max-width: 46.6%; + letter-spacing: 3px; + } + + .shop-tab.active { + background-color: var(--primary) !important; + pointer-events: none !important; + cursor: default !important; + } +
+
+
+
+
+ + AWARDS + + + HATS + +
+
+
+
+
+
shop banner

{{SHOP_FLAVOR}} Earn coins.

@@ -31,8 +60,6 @@ {% if FEATURES['PROCOINS'] %}
Your current marseybux: {{"{:,}".format(v.procoins)}}
{% endif %} - -
Buy hats here!
{% endblock %}