forked from rDrama/rDrama
Bussysussy (#256)
* improved static emojis descriptions and file readability * perf improv. 2 * some minor tweaks * final tweaks to js and mobile css * very finalmaster
parent
89799eb429
commit
99eeb3ee4b
|
@ -35,9 +35,9 @@ def marsey_list():
|
||||||
# From database
|
# From database
|
||||||
emojis = [{
|
emojis = [{
|
||||||
"name": emoji.name,
|
"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
|
# 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,
|
"count": emoji.count,
|
||||||
"class": "Marsey"
|
"class": "Marsey"
|
||||||
} for emoji, author in g.db.query(Marsey, User.username).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc())]
|
} for emoji, author in g.db.query(Marsey, User.username).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc())]
|
||||||
|
|
|
@ -2,15 +2,28 @@
|
||||||
<div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
|
<div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
|
||||||
<style>
|
<style>
|
||||||
#emojiTabs {height: 80%;}
|
#emojiTabs {height: 80%;}
|
||||||
@media (max-height: 900px) {
|
@media (max-height: 650px) {
|
||||||
#emojiTabs {height: 100%;}
|
#emojiTabs {height: 100%;}
|
||||||
#emojiModalInternalDivIDK {margin-top: 0 !important; margin-bottom: 0 !important; padding-top: 0 !important; padding-bottom: 0 !important;}
|
#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>
|
</style>
|
||||||
<div id="emojiModalInternalDivIDK" class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-2 py-5 emoji-modal" role="document">
|
<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-content" id="emojiTabs">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<div>
|
<div id="emoji-modal-tabs-container">
|
||||||
<ul class="nav nav-pills py-2" id="emoji-modal-tabs">
|
<ul class="nav nav-pills py-2" id="emoji-modal-tabs">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link active emojitab" data-class-name="favorite" data-bs-toggle="tab" href="#" onclick="switchEmojiTab(event)">⭐ Favorite ⭐</a>
|
<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>
|
<label for="emoji-sel-2">Pat</label>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<!--
|
|
||||||
<fieldset class="p-2">
|
|
||||||
<label>marseyalphabet:</label>
|
|
||||||
<input type="text">
|
|
||||||
<button>generate!</button>
|
|
||||||
</fieldset>-->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="overflow-y: scroll;">
|
<div style="overflow-y: scroll;">
|
||||||
|
@ -60,6 +67,10 @@
|
||||||
<div id="emojis-work" class="tab-content py-3 pl-2">
|
<div id="emojis-work" class="tab-content py-3 pl-2">
|
||||||
I am working as hard as I can, sweety... 🚴
|
I am working as hard as I can, sweety... 🚴
|
||||||
</div>
|
</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>
|
<div id="tab-content" class="tab-content d-flex flex-wrap py-3 pl-2" hidden>
|
||||||
<style>
|
<style>
|
||||||
.emoji2 {
|
.emoji2 {
|
||||||
|
|
Loading…
Reference in New Issue