MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity

fix-small-tisms that I had piled up in my todo (#109) 

fix-small-tisms that I had piled up in my todo

Reviewed-on: rDrama/rDrama#109
Co-authored-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
Co-committed-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
pull/110/head
mummified-corroding-granny 2023-02-02 16:54:52 +00:00 committed by Aevann
parent 59ee320584
commit b0797c4493
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/assets/css/main.css
View File

@ -5562,6 +5562,10 @@ th, td {
font-weight: 700;
}
.discounted-price {
text-decoration: line-through;
}
.fas {
text-align: center;
}

4
files/classes/submission.py
View File

@ -199,7 +199,6 @@ class Submission(Base):
'url': self.realurl(None),
'body': self.body,
'body_html': self.body_html,
'created_utc': self.created_utc,
'edited_utc': self.edited_utc or 0,
'comment_count': self.comment_count,
'score': self.score,
@ -210,8 +209,7 @@ class Submission(Base):
'distinguish_level': self.distinguish_level,
'voted': self.voted if hasattr(self, 'voted') else 0,
'flags': flags,
'author': '👻' if self.ghost else self.author.json,
'comment_count': self.comment_count
'author': '👻' if self.ghost else self.author.json
}
if "replies" in self.__dict__:

2
files/routes/users.py
View File

@ -1376,7 +1376,7 @@ def gumroad():
print(f'user: {user}', flush=True)
if user:
claim_rewards(user)
claim_rewards(user)
print("/gumroad done\n\n\n-----------------------\n\n\n", flush=True)

2
files/templates/modals/emoji.html
View File

@ -47,7 +47,7 @@
</div>
<div id="tab-content" class="tab-content d-flex flex-wrap py-3 pl-2" hidden style="text-align:center;">
<template id="emoji-button-template">
<button type="button" class="btn m-1 px-0 emoji2" data-bs-toggle="tooltip" delay:="0">
<button type="button" class="btn m-1 px-0 emoji2" data-bs-toggle="tooltip">
<img loading="lazy" width=60 height=85>
</button>
</template>

2
files/templates/rules_rDrama.html
View File

@ -1,6 +1,6 @@
<p>Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.</p>
<p><strong>Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.</strong></p>
<p><a href="http://rdrama.net" rel="nofollow noopener" target="_blank">http://rdrama.net</a> caters to drama in all forms such as: <strong>Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™</strong>. There isn't drama we won't touch, and we want it all.</p>
<p><a href="https://rdrama.net" rel="nofollow noopener" target="_blank">https://rdrama.net</a> caters to drama in all forms such as: <strong>Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™</strong>. There isn't drama we won't touch, and we want it all.</p>
<h3>What we want:</h3>
<ul>
<li><p>Arguments.</p></li>

6
files/templates/shop.html
View File

@ -26,13 +26,13 @@
<header class="container pb-1 text-center">
<img loading="lazy" id="shop-banner" alt="shop banner" src="/i/shop.webp">
<h3 class="mt-4">{{SHOP_FLAVOR}} Earn coins.</h5>
<h5 class="mt-4">{{SHOP_FLAVOR}} Earn coins.</h5>
<h5 class="mt-4">Total sales: {{"{:,}".format(sales)}} coins</h5>
<h5 class="mt-4">Coins spent by you: {{"{:,}".format(v.coins_spent)}} coins</h5>
<h5 class="mt-4">Lootboxes bought by you: {{v.lootboxes_bought}} lootbox{{'es' if v.lootboxes_bought != 1}}</h5>
<h5 class="mt-4">Your current coins: {{"{:,}".format(v.coins)}}</h5>
{% if FEATURES['MARSEYBUX'] %}
<h5 class="mt-4">Your current marseybux: {{"{:,}".format(v.marseybux)}}</h3>
<h5 class="mt-4">Your current marseybux: {{"{:,}".format(v.marseybux)}}</h5>
{% endif %}
</header>
{% endblock %}
@ -56,7 +56,7 @@
<td class="shop-table-title">{{a['title']}}</td>
{% if a['baseprice'] != a['price'] %}
<td class="shop-table-price">
<strike>{{a['baseprice']}}</strike> <em class="text-success">{{a['price']}}</em>
<span class="discounted-price">{{a['baseprice']}}</span> <em class="text-success">{{a['price']}}</em>
</td>
{% else %}
<td class="shop-table-price">{{a['price']}}</td>