gerudo
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity

fdgMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

master
Aevann1 2022-06-24 00:31:30 +00:00
parent 4b077d697a b3980660c1
commit c9dce89046
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/routes/users.py
View File

@ -531,9 +531,6 @@ def leaderboard(v):
else: pos11 = (users11.count()+1, 0)
users11 = users11.limit(25).all()
if pos11[1] < 25 and v not in (x[0] for x in users11):
pos11 = (26, pos11[1])
if SITE_NAME == 'rDrama':
sq = g.db.query(Marsey.author_id, func.count(Marsey.author_id).label("count"), func.rank().over(order_by=func.count(Marsey.author_id).desc()).label("rank")).group_by(Marsey.author_id).subquery()
users12 = g.db.query(User, sq.c.count).join(sq, User.id==sq.c.author_id).order_by(sq.c.count.desc())

2
files/templates/emoji_modal.html
View File

@ -2,7 +2,7 @@
<div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
<style>
#emojiTabs {height: 80%;}
@media (max-height: 650px) {
@media (max-width: 650px) {
#emojiTabs {height: 100%;}
#emojiModalInternalDivIDK {margin-top: 0 !important; margin-bottom: 0 !important; padding-top: 0 !important; padding-bottom: 0 !important;}