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

Merge pull request #149 from Aevann1/george 

George
master
Gray 2021-12-28 21:58:58 -06:00 committed by GitHub
parent 76a5941116 ed6951fec1
commit 2124f15439
6 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/static/dist/main.css vendored
View File

@ -1172,8 +1172,8 @@ video {
.h-7 {
height: 1.75rem;
}
.max-h-10 {
max-height: 2.5rem;
.max-h-0 {
max-height: 0px;
}
.max-h-\[20rem\] {
max-height: 20rem;
@ -1226,9 +1226,6 @@ video {
.w-\[14px\] {
width: 14px;
}
.w-24 {
width: 6rem;
}
.w-8 {
width: 2rem;
}
@ -3760,6 +3757,10 @@ video {
display: none;
}
.sm\:max-h-10 {
max-height: 2.5rem;
}
.sm\:items-stretch {
align-items: stretch;
}
@ -3787,6 +3788,11 @@ video {
padding-right: 0px;
}
.sm\:text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
}
.sm\:text-base {
font-size: 1rem;
line-height: 1.5rem;

2
files/templates/CHRISTMAS/default.html
View File

@ -194,7 +194,7 @@
<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2">
<link rel="stylesheet" href="/static/dist/main.css?a=2">
<link rel="stylesheet" href="/static/dist/main.css?a=3">
{% if v %}
<style>:root{--primary:#dc2626}</style>

2
files/templates/CHRISTMAS/home.html
View File

@ -73,7 +73,7 @@
<script src="/assets/CHRISTMAS/js/pusher.js?a=1"></script>
{% endif %}
<script src="/assets/CHRISTMAS/js/submission_listing.js?a=3"></script>
<script src="/assets/CHRISTMAS/js/submission_listing.js?a=6"></script>
{% if v and not v.fp %}
<script>

2
files/templates/CHRISTMAS/settings.html
View File

@ -36,7 +36,7 @@
<link rel="stylesheet" href="/assets/CHRISTMAS/css/main.css?a=2">
<link rel="stylesheet" href="/static/dist/main.css?a=2">
<link rel="stylesheet" href="/static/dist/main.css?a=3">
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>

4
files/templates/CHRISTMAS/submission.html
View File

@ -271,7 +271,7 @@
{% if not p.is_image and p.thumb_url and not p.embed_url %}
<div class="hidden md:block pl-3 flex-shrink-0">
<a rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0" alt="post thumbnail">
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0" alt="post thumbnail">
</a>
</div>
{% endif %}
@ -368,7 +368,7 @@
</div>
<!-- Title -->
<h1 id="post-title" class="{% if p.author.agendaposter %}agendaposter{% endif %} post-title font-medium text-lg md:text-3xl leading-normal mb-2">
<h1 id="post-title" class="{% if p.author.agendaposter %}agendaposter{% endif %} post-title font-medium sm:text-lg md:text-3xl leading-normal mb-2">
{% if p.realurl(v) %}
<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}" class="text-black dark:text-gray-200 hover:text-primary" style="word-break: break-word;">
{{p.realtitle(v) | safe}}

20
files/templates/CHRISTMAS/submission_listing.html
View File

@ -241,14 +241,14 @@
{% endif %}
</div>
<h5 class="post-title font-medium text-lg md:text-xl leading-5 mb-2">
<h5 class="post-title font-medium sm:text-lg md:text-xl leading-5 mb-2">
<a {% if v and v.newtab %}target="_blank"{% endif %} href="{{p.permalink}}" class="{% if p.author.agendaposter %}agendaposter{% endif %} stretched-link text-black dark:text-gray-200 hover:text-primary visited:text-gray-700 dark:visited:text-gray-400 break-words" style="word-break: break-word;">
{{p.realtitle(v) | safe}}
</a>
</h5>
{% if p.realbody(v) and not p.over_18 %}
<div class="{% if p.author.agendaposter %}agendaposter{% endif %} post-text relative z-10 gradient-mask max-h-10 overflow-hidden pointer-events-none text-gray-500 break-words" style="word-break: break-word;" id="post-text-{{p.id}}">
<div class="{% if p.author.agendaposter %}agendaposter{% endif %} post-text relative z-10 gradient-mask max-h-0 sm:max-h-10 overflow-hidden pointer-events-none text-gray-500 break-words" style="word-break: break-word;" id="post-text-{{p.id}}">
{{p.realbody(v) | safe}}
</div>
{% endif %}
@ -260,26 +260,26 @@
<div class="relative z-10 flex flex-row flex-nowrap pl-3 md:pl-5 flex-shrink-0">
{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
{% elif not p.url %}
<a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
</a>
{% elif p.is_image %}
<a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#expandImageModal" data-bs-url="{{p.realurl(v)}}" onclick="expandDesktopImage('{{ p.realurl(v) }}')">
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
</a>
{% elif p.is_video %}
<a href="javascript:void(0)" onclick="toggleVideo({{p.id}})">
<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
</a>
{% elif p.is_youtube %}
<a href="javascript:void(0)" onclick="document.getElementById('video-{{p.id}}').classList.toggle('hidden')">
<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
</a>
{% else %}
<a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-24 h-16 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
<img loading="lazy" src="{{p.thumb_url}}" class="post-thumbnail shadow-sm p-[3px] w-20 h-14 md:w-32 md:h-20 object-cover bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-700 flex-shrink-0">
</a>
{% endif %}
</div>
@ -310,7 +310,7 @@
</div>
{% endif %}
<div class="relative z-10 md:hidden pt-3">
<div class="relative z-10 md:hidden">
{% include "CHRISTMAS/submission/SubmissionActionsMobile.html" %}
</div>
@ -388,7 +388,7 @@
{% include "CHRISTMAS/expanded_image_modal.html" %}
<script defer src="/assets/CHRISTMAS/js/new_comments_count.js?a=1"></script>
<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=3"></script>
<script defer src="/assets/CHRISTMAS/js/submission_listing.js?a=6"></script>
<style>
.mod:before {