n word
|
@ -5701,4 +5701,8 @@ blockquote p {
|
|||
|
||||
.bet ~ .custom-control-label::before {
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.emoji-modal {
|
||||
max-width: 90% !important
|
||||
}
|
BIN
files/assets/images/emojis/marsey40k.webp
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
files/assets/images/emojis/marseyangel2.webp
Normal file
After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 24 KiB |
BIN
files/assets/images/emojis/marseyblack.webp
Normal file
After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 25 KiB |
BIN
files/assets/images/emojis/marseybongo.webp
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
files/assets/images/emojis/marseybongosnoo.webp
Normal file
After Width: | Height: | Size: 7 KiB |
BIN
files/assets/images/emojis/marseybongosrdine.webp
Normal file
After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 16 KiB |
BIN
files/assets/images/emojis/marseychonker2.webp
Normal file
After Width: | Height: | Size: 7 KiB |
BIN
files/assets/images/emojis/marseychristmasbulb2.webp
Normal file
After Width: | Height: | Size: 7.2 KiB |
BIN
files/assets/images/emojis/marseychristmaself2.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseychristmasgift.webp
Normal file
After Width: | Height: | Size: 7.8 KiB |
BIN
files/assets/images/emojis/marseychristmaslove.webp
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
files/assets/images/emojis/marseychristmasparty.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseychristmasscarf.webp
Normal file
After Width: | Height: | Size: 9.4 KiB |
BIN
files/assets/images/emojis/marseydiehard.webp
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
files/assets/images/emojis/marseydoubtit.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseyextinction.webp
Normal file
After Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 23 KiB |
BIN
files/assets/images/emojis/marseyfatherjoseph.webp
Normal file
After Width: | Height: | Size: 9.2 KiB |
BIN
files/assets/images/emojis/marseyfuckyou.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseygangbang.webp
Normal file
After Width: | Height: | Size: 4.5 KiB |
BIN
files/assets/images/emojis/marseygingerbread.webp
Normal file
After Width: | Height: | Size: 8 KiB |
BIN
files/assets/images/emojis/marseygingerbread2.webp
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
files/assets/images/emojis/marseygingerbread3.webp
Normal file
After Width: | Height: | Size: 7.1 KiB |
BIN
files/assets/images/emojis/marseygold.webp
Normal file
After Width: | Height: | Size: 6.6 KiB |
BIN
files/assets/images/emojis/marseyhotep.webp
Normal file
After Width: | Height: | Size: 8 KiB |
BIN
files/assets/images/emojis/marseyicecream.webp
Normal file
After Width: | Height: | Size: 92 KiB |
BIN
files/assets/images/emojis/marseyimmaculate.webp
Normal file
After Width: | Height: | Size: 114 KiB |
BIN
files/assets/images/emojis/marseyimpossibru.webp
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
files/assets/images/emojis/marseykamikaze.webp
Normal file
After Width: | Height: | Size: 6 KiB |
BIN
files/assets/images/emojis/marseykkkblm.webp
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
files/assets/images/emojis/marseyklenny.webp
Normal file
After Width: | Height: | Size: 25 KiB |
BIN
files/assets/images/emojis/marseykrampus2.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseykys2.webp
Normal file
After Width: | Height: | Size: 83 KiB |
BIN
files/assets/images/emojis/marseylois.webp
Normal file
After Width: | Height: | Size: 9.2 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 20 KiB |
BIN
files/assets/images/emojis/marseymerchantelf.webp
Normal file
After Width: | Height: | Size: 8 KiB |
BIN
files/assets/images/emojis/marseymothermary.webp
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
files/assets/images/emojis/marseynutcracker.webp
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
files/assets/images/emojis/marseyobama.webp
Normal file
After Width: | Height: | Size: 5.4 KiB |
BIN
files/assets/images/emojis/marseyoctopus2.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseyoctopus3.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseypartymaxx.webp
Normal file
After Width: | Height: | Size: 320 KiB |
BIN
files/assets/images/emojis/marseypartyxmas.webp
Normal file
After Width: | Height: | Size: 160 KiB |
BIN
files/assets/images/emojis/marseypartyzoom.webp
Normal file
After Width: | Height: | Size: 288 KiB |
BIN
files/assets/images/emojis/marseypin.webp
Normal file
After Width: | Height: | Size: 13 KiB |
BIN
files/assets/images/emojis/marseyplaying.webp
Normal file
After Width: | Height: | Size: 25 KiB |
BIN
files/assets/images/emojis/marseyplaying2.webp
Normal file
After Width: | Height: | Size: 25 KiB |
BIN
files/assets/images/emojis/marseyplugged.webp
Normal file
After Width: | Height: | Size: 8.9 KiB |
BIN
files/assets/images/emojis/marseyponder.webp
Normal file
After Width: | Height: | Size: 5.6 KiB |
BIN
files/assets/images/emojis/marseypredator.webp
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
files/assets/images/emojis/marseyraccoon.webp
Normal file
After Width: | Height: | Size: 7.6 KiB |
BIN
files/assets/images/emojis/marseyrake.webp
Normal file
After Width: | Height: | Size: 7.5 KiB |
BIN
files/assets/images/emojis/marseyreindeer3.webp
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
files/assets/images/emojis/marseyreindeer4.webp
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
files/assets/images/emojis/marseysanta3.webp
Normal file
After Width: | Height: | Size: 9.6 KiB |
BIN
files/assets/images/emojis/marseysexy.webp
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
files/assets/images/emojis/marseyshutitdown.webp
Normal file
After Width: | Height: | Size: 212 KiB |
BIN
files/assets/images/emojis/marseyski.webp
Normal file
After Width: | Height: | Size: 5.4 KiB |
BIN
files/assets/images/emojis/marseysnow.webp
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
files/assets/images/emojis/marseysnowman.webp
Normal file
After Width: | Height: | Size: 7.9 KiB |
BIN
files/assets/images/emojis/marseysnowman2.webp
Normal file
After Width: | Height: | Size: 6.9 KiB |
BIN
files/assets/images/emojis/marseytransflag.webp
Normal file
After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 23 KiB |
BIN
files/assets/images/emojis/marseyvirus.webp
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
files/assets/images/emojis/marseywholesome.webp
Normal file
After Width: | Height: | Size: 6.8 KiB |
BIN
files/assets/images/emojis/retardedchildren.webp
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
files/assets/images/emojis/trolldespair.webp
Normal file
After Width: | Height: | Size: 2.1 KiB |
|
@ -477,7 +477,7 @@ class User(Base):
|
|||
def json(self):
|
||||
data = self.json_core
|
||||
|
||||
data["badges"] = [x.json_core for x in self.badges]
|
||||
data["badges"] = [x.json for x in self.badges]
|
||||
data['coins'] = self.coins
|
||||
data['post_count'] = self.post_count
|
||||
data['comment_count'] = self.comment_count
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
{% else %}
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
<script src="/assets/js/bootstrap.js?v=1"></script>
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153">
|
||||
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
{% else %}
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
{% endif %}
|
||||
|
||||
<link href="/assets/css/fa.css?v=55" rel="stylesheet">
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<div id="form" class="d-none"></div>
|
||||
<div class="modal fade" id="emojiModal" tabindex="-1" role="dialog" aria-labelledby="emojiModalTitle" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-2 py-5" role="document">
|
||||
<div 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>
|
||||
|
@ -81,7 +81,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/assets/js/emoji_modal.js?v=147"></script>
|
||||
<script src="/assets/js/emoji_modal.js?v=154"></script>
|
||||
|
||||
<style>
|
||||
a.emojitab {
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
{% block content %}
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
{% else %}
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
{% endif %}
|
||||
|
||||
<div class="row justify-content-around">
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
{% endblock %}
|
||||
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=70">
|
||||
<link href="/assets/css/fa.css?v=55" rel="stylesheet">
|
||||
|
||||
</head>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
|
||||
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
|
||||
</head>
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
|
||||
<link href="/assets/css/fa.css?v=55" rel="stylesheet">
|
||||
|
|
|
@ -38,10 +38,10 @@
|
|||
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
{% else %}
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
{% endif %}
|
||||
|
||||
<link href="/assets/css/fa.css?v=55" rel="stylesheet">
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}</title>
|
||||
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
|
||||
</head>
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
|
||||
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
|
||||
</head>
|
||||
|
||||
|
|
|
@ -25,11 +25,11 @@
|
|||
{% block stylesheets %}
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
{% else %}
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=152">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=153">
|
||||
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|