carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

Bussysussy (#256) 

* improved static emojis descriptions and file readability

* perf improv. 2

* some minor tweaks

* final tweaks to js and mobile css

* very final
master
DrTransmisia 2022-05-10 02:58:57 +02:00 committed by GitHub
parent 89799eb429
commit 99eeb3ee4b
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/routes/static.py
View File

@ -35,9 +35,9 @@ def marsey_list():
# From database
emojis = [{
"name": emoji.name,
"author": author if SITE_NAME == 'rDrama' else "rDrama's chads",
"author": author if SITE_NAME == 'rDrama' else None,
# yikes, I don't really like this DB schema. Next time be better
"tags": emoji.tags.split(" ") + [emoji.name[len("marsey"):] if emoji.name.startswith("marsey") else emoji.name] + ([author] if SITE_NAME == 'rDrama' else []),
"tags": emoji.tags.split(" ") + [emoji.name[len("marsey"):] if emoji.name.startswith("marsey") else emoji.name],
"count": emoji.count,
"class": "Marsey"
} for emoji, author in g.db.query(Marsey, User.username).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc())]

27
files/templates/emoji_modal.html
View File

@ -2,15 +2,28 @@
<div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
<style>
#emojiTabs {height: 80%;}
@media (max-height: 900px) {
@media (max-height: 650px) {
#emojiTabs {height: 100%;}
#emojiModalInternalDivIDK {margin-top: 0 !important; margin-bottom: 0 !important; padding-top: 0 !important; padding-bottom: 0 !important;}
#emoji-modal-tabs-container {
overflow-x: auto;
}
#emoji-modal-tabs {
white-space: nowrap;
flex-wrap: nowrap;
}
#emoji-modal-tabs li {
display: inline-block;
}
}
</style>
<div id="emojiModalInternalDivIDK" class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-2 py-5 emoji-modal" role="document">
<div class="modal-content" id="emojiTabs">
<div class="modal-header">
<div>
<div id="emoji-modal-tabs-container">
<ul class="nav nav-pills py-2" id="emoji-modal-tabs">
<li class="nav-item">
<a class="nav-link active emojitab" data-class-name="favorite" data-bs-toggle="tab" href="#" onclick="switchEmojiTab(event)">⭐ Favorite ⭐</a>
@ -44,12 +57,6 @@
<label for="emoji-sel-2">Pat</label>
</div>
</fieldset>
<!--
<fieldset class="p-2">
<label>marseyalphabet:</label>
<input type="text">
<button>generate!</button>
</fieldset>-->
</div>
<div style="overflow-y: scroll;">
@ -60,6 +67,10 @@
<div id="emojis-work" class="tab-content py-3 pl-2">
I am working as hard as I can, sweety... 🚴
</div>
<div id="emoji-new-user" class="tab-content py-3 pl-2" hidden>
👋 Hello! This is the first time you're using the emoji system on this device 📱.<br>
I've took the liberty to populate this tab with a selection of Anton's emojis 😽. Next time you'll find the ones you used the most in there 📚
</div>
<div id="tab-content" class="tab-content d-flex flex-wrap py-3 pl-2" hidden>
<style>
.emoji2 {