diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 76e9aa23c..2f24d91d3 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -4038,7 +4038,7 @@ small, .small { .voting .arrow-down { display: block; - text-decoration: none; + text-decoration: none; } .box-shadow-bottom { @@ -7593,6 +7593,6 @@ body { } .rainbow-text del { - color: var(--black); + color: var(--black); font-weight: 400; } diff --git a/files/assets/css/orgy.css b/files/assets/css/orgy.css index ab33aaa00..20d53958c 100644 --- a/files/assets/css/orgy.css +++ b/files/assets/css/orgy.css @@ -4,22 +4,22 @@ } @media all and (max-width: 900px) { - .orgy-top-container { - flex-flow: column wrap; - } - .orgy-info-window-item { - max-height: 20% !important; - height: 20% !important; - } - .orgy-chat-window-item { - max-height: 80% !important; - height: 80% !important; - } + .orgy-top-container { + flex-flow: column wrap; + } + .orgy-info-window-item { + max-height: 20% !important; + height: 20% !important; + } + .orgy-chat-window-item { + max-height: 80% !important; + height: 80% !important; + } } @media all and (min-width: 900px) { - .orgy-top-container { - flex-flow: row nowrap; - } + .orgy-top-container { + flex-flow: row nowrap; + } } .orgy-chat-window-item { @@ -31,7 +31,7 @@ width: 550px; } .rumble-player { - aspect-ratio: 16/9; - max-width: min(70vw,500px) !important; - width: 500px; + aspect-ratio: 16/9; + max-width: min(70vw,500px) !important; + width: 500px; } diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index c51e6b2da..7471915af 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -101,7 +101,7 @@ {% if v.admin_level >= PERMS['ORGIES'] %}

Misc

{%- endif %}

Statistics

diff --git a/files/templates/admin/orgy_control.html b/files/templates/admin/orgy_control.html index bdc903935..006644079 100644 --- a/files/templates/admin/orgy_control.html +++ b/files/templates/admin/orgy_control.html @@ -13,37 +13,37 @@
- {%if not orgy%} -
-
-
- -
-
- -
-
-
-
- -
-
- -
-
- -
- -
-
- {%else%} -
- -
- -
-
- {%endif%} + {%if not orgy%} +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ {%else%} +
+ +
+ +
+
+ {%endif%}
diff --git a/files/templates/orgy.html b/files/templates/orgy.html index 9d6c6251d..4ecb1965c 100644 --- a/files/templates/orgy.html +++ b/files/templates/orgy.html @@ -11,39 +11,39 @@
-
-

{{orgy.title}}

-
- {% if orgy.is_youtube() %} - - {% elif orgy.is_rumble() %} - - {% elif orgy.is_twitch() %} - - {%endif%} -
- Old Chat - {{macros.chat_users_list()}} -
+
+

{{orgy.title}}

+
+ {% if orgy.is_youtube() %} + + {% elif orgy.is_rumble() %} + + {% elif orgy.is_twitch() %} + + {%endif%} +
+ Old Chat + {{macros.chat_users_list()}} +
-
-
- {{macros.chat_group_template()}} -
-
+
+
+ {{macros.chat_group_template()}} +
+
-
- {{macros.chat_line_template()}} -
- {{macros.chat_users_online()}} - {{macros.chat_window(vlink)}} -
+
+ {{macros.chat_line_template()}} +
+ {{macros.chat_users_online()}} + {{macros.chat_window(vlink)}} +
- + diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index 71c9869a4..8bd20ca9a 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -222,128 +222,128 @@ {% macro chat_users_online() %}
- - - 0 - + + + 0 +
{% endmacro %} {% macro chat_group_template(id, m) %} -
-
{% if m %}{{m['username']}}{% else %}NULL{% endif %} - {% if m %}{{m['time'] | timestamp}}{% else %}just now{% endif %} - +
+
{% if m %}{{m['username']}}{% else %}NULL{% endif %} + {% if m %}{{m['time'] | timestamp}}{% else %}just now{% endif %} + {% endmacro %} {% macro chat_line_template(id, m, vlink) %} - {% set quote_exists = m and m['quotes'] and messages.get(m['quotes']) %} - {% set mentioned = m and vlink in m['text_html'] or (quote_exists and messages[m['quotes']]['user_id'] == v.id) %} -
-
-
-
- - - @ - {%- if quote_exists -%} - {{messages[m['quotes']]['username']}} - {%- endif -%} - : - - {%- if quote_exists -%} + {% set quote_exists = m and m['quotes'] and messages.get(m['quotes']) %} + {% set mentioned = m and vlink in m['text_html'] or (quote_exists and messages[m['quotes']]['user_id'] == v.id) %} +
+
+
+
+ + + @ + {%- if quote_exists -%} + {{messages[m['quotes']]['username']}} + {%- endif -%} + : + + {%- if quote_exists -%} {%- if v.slurreplacer -%} {{messages[m['quotes']]['text_censored']}} {%- else -%} {{messages[m['quotes']]['text']}} {%- endif -%} - {%- endif -%} - - -
+ {%- endif -%} + + +
-
- - {% if m %} - {% if v.slurreplacer %} - {{m['text_html_censored'] | safe}} - {% else %} - {{m['text_html'] | safe}} - {% endif %} - {% endif %} - - +
+ + {% if m %} + {% if v.slurreplacer %} + {{m['text_html_censored'] | safe}} + {% else %} + {{m['text_html'] | safe}} + {% endif %} + {% endif %} + + {%- if m -%} - {%- if v.slurreplacer -%} - {{m['text_censored']}} - {%- else -%} - {{m['text']}} - {%- endif -%} + {%- if v.slurreplacer -%} + {{m['text_censored']}} + {%- else -%} + {{m['text']}} + {%- endif -%} {%- endif -%} - - {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} - - - {% endif %} -
-
-
-
+ + {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} + + + {% endif %} +
+
+
+
{% endmacro %} {% macro chat_window(vlink)%}
-
- {% set messages_list = messages.items()|list %} - {% for id, m in messages_list %} - {% set same = loop.index > 1 and m['user_id'] == messages_list[loop.index-2][1]['user_id'] %} - {% if not same %} - {% if loop.index > 1 %} -
- {% endif %} - {{chat_group_template(id, m)}} - {% endif %} - {{chat_line_template(id, m, vlink)}} - {% endfor %} -
-
+
+ {% set messages_list = messages.items()|list %} + {% for id, m in messages_list %} + {% set same = loop.index > 1 and m['user_id'] == messages_list[loop.index-2][1]['user_id'] %} + {% if not same %} + {% if loop.index > 1 %} +
+ {% endif %} + {{chat_group_template(id, m)}} + {% endif %} + {{chat_line_template(id, m, vlink)}} + {% endfor %} +
+ -
-
- - @: - - - -
+
+
+ + @: + + + +
-
-
- - -
- - - +
+
+ + +
+ + + - - - + + + - + - -
+ +
{% endmacro %} {% macro chat_users_list() %} -
-
Users Online
-
-
+
+
Users Online
+
+
{% endmacro %}