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

Merge branches 'frost' and 'frost' of https://github.com/Aevann1/Drama into frost

master
Aevann1 2021-12-21 21:57:23 +02:00
parent 71515bdeb9 df9c6d16e2
commit 3b961c3061
7 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@
<h1 class="font-bold text-xl font-heading leading-normal mb-0"> <h1 class="font-bold text-xl font-heading leading-normal mb-0">
Settings Settings
</h1> </h1>
<small class="hidden lg:block text-gray-700 leading-normal"> <small class="hidden lg:block text-gray-700 dark:text-gray-400 leading-normal">
Manage your rDrama profile and more. Manage your rDrama profile and more.
</small> </small>
<ul class="text-xs flex lg:hidden items-center space-x-3 leading-normal mb-0"> <ul class="text-xs flex lg:hidden items-center space-x-3 leading-normal mb-0">

10
files/templates/CHRISTMAS/shop.html
View File

@ -6,13 +6,13 @@
{% block subHeader %} {% block subHeader %}
<div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t"> <div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t">
<div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 rounded-t sub-header-shadow"></div> <div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 dark:bg-none dark:bg-gray-800 rounded-t sub-header-shadow dark:border-b dark:border-gray-700"></div>
<div class="relative col-span-full flex items-center"> <div class="relative col-span-full flex items-center">
<div> <div>
<h1 class="font-bold text-xl font-heading leading-normal mb-0"> <h1 class="font-bold text-xl font-heading leading-normal mb-0">
rDrama's Holigay Emporium rDrama's Holigay Emporium
</h1> </h1>
<small class="block text-gray-700"> <small class="block text-gray-700 dark:text-gray-400">
Stir drama. Earn coins. Stir drama. Earn coins.
</small> </small>
</div> </div>
@ -21,19 +21,19 @@
<strong class="text-lg md:text-2xl"> <strong class="text-lg md:text-2xl">
{{v.coins}} {{v.coins}}
</strong> </strong>
<small class="text-gray-700">your balance</small> <small class="text-gray-700 dark:text-gray-400">your balance</small>
</li> </li>
<li> <li>
<strong class="text-lg md:text-2xl"> <strong class="text-lg md:text-2xl">
{{v.coins_spent}} {{v.coins_spent}}
</strong> </strong>
<small class="text-gray-700">spent by you</small> <small class="text-gray-700 dark:text-gray-400">spent by you</small>
</li> </li>
<li> <li>
<strong class="text-lg md:text-2xl"> <strong class="text-lg md:text-2xl">
{{sales}} {{sales}}
</strong> </strong>
<small class="text-gray-700">total sales</small> <small class="text-gray-700 dark:text-gray-400">total sales</small>
</li> </li>
</ul> </ul>
</div> </div>

24
files/templates/CHRISTMAS/sidebars/HomeSidebar.html
View File

@ -42,29 +42,13 @@
<img class="object-contain w-5 h-5" src="/assets/CHRISTMAS/ribbon1.png" alt="ribbon icon"> <img class="object-contain w-5 h-5" src="/assets/CHRISTMAS/ribbon1.png" alt="ribbon icon">
</div> </div>
<div class="pl-3 mt-[-1px] truncate"> <div class="pl-3 mt-[-1px] truncate">
<a href="/post/29885/" class="block font-medium text-black dark:text-gray-200 hover:text-primary truncate ellipsis"> <a href="/post/31225/" class="block font-medium text-black dark:text-gray-200 hover:text-primary truncate ellipsis">
On the Twelfth day of Christmas MasterLawlz gave to meee [Finale] PSA: The new redesigned site default is now Dark Mode.
</a> </a>
<small class="block text-gray-500"> <small class="block text-gray-500">
posted by posted by
<a href="/@HoHoHotep" class="text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"> <a href="/@Joan_Wayne_Gacy" class="text-gray-500 hover:text-gray-600 dark:hover:text-gray-400">
@HoHoHotep @Joan_Wayne_Gacy
</a>
</small>
</div>
</li>
<li class="flex">
<div class="flex items-center justify-center px-2 flex-shrink-0">
<img class="object-contain w-5 h-5" src="/assets/CHRISTMAS/ribbon1.png" alt="ribbon icon">
</div>
<div class="pl-3 mt-[-1px] truncate">
<a href="/post/29916/" class="block font-medium text-black dark:text-gray-200 hover:text-primary truncate ellipsis">
PUBLIC DRAMACOIN MINE
</a>
<small class="block text-gray-500">
posted by
<a href="/@SeetheFarmer" class="text-gray-500 hover:text-gray-600 dark:hover:text-gray-400">
@SeetheFarmer
</a> </a>
</small> </small>
</div> </div>

2
files/templates/CHRISTMAS/sidebars/ProfileSidebar.html
View File

@ -3,7 +3,7 @@
<h2 class="ml-2 font-bold text-lg font-heading leading-normal mb-2">About</h2> <h2 class="ml-2 font-bold text-lg font-heading leading-normal mb-2">About</h2>
<div class="flex flex-col space-y-4"> <div class="flex flex-col space-y-4">
{% if u.bio_html %} {% if u.bio_html %}
<div class="text-black text-break">{{u.bio_html | safe}}</div> <div class="text-break">{{u.bio_html | safe}}</div>
{% else %} {% else %}
<p class="italic text-gray-500 text-sm">No bio...</p> <p class="italic text-gray-500 text-sm">No bio...</p>
{% endif %} {% endif %}

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

@ -320,7 +320,7 @@
<!-- Title --> <!-- Title -->
<h1 id="post-title" class="post-title font-medium text-lg md:text-3xl leading-normal mb-2"> <h1 id="post-title" class="post-title font-medium text-lg md:text-3xl leading-normal mb-2">
{% if p.realurl(v) %} {% 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"> <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}} {{p.realtitle(v) | safe}}
</a> </a>
{% else %} {% else %}

12
files/templates/CHRISTMAS/userpage.html
View File

@ -170,7 +170,7 @@
<div class="relative col-span-full flex xl:hidden flex-col"> <div class="relative col-span-full flex xl:hidden flex-col">
<div class="mt-3"> <div class="mt-3">
{% if u.bio_html %} {% if u.bio_html %}
<div class="text-black text-break">{{u.bio_html | safe}}</div> <div class="text-break">{{u.bio_html | safe}}</div>
{% else %} {% else %}
<p class="italic text-gray-500 text-sm">No bio...</p> <p class="italic text-gray-500 text-sm">No bio...</p>
{% endif %} {% endif %}
@ -178,20 +178,22 @@
{% if u.id == v.id or not u.is_private %} {% if u.id == v.id or not u.is_private %}
<ul class="flex items-center space-x-3 mt-3 mb-0"> <ul class="flex items-center space-x-3 mt-3 mb-0">
<li> <li>
<a href="/@{{ u.username }}/followers" class="text-black text-lg font-bold mb-0">{{ u.stored_subscriber_count }}</a> <a href="/@{{ u.username }}/followers" class="text-black dark:text-gray-100 text-lg font-bold mb-0">
{{ u.stored_subscriber_count }}
</a>
<small class="block font-bold text-gray-500">Followers</small> <small class="block font-bold text-gray-500">Followers</small>
</li> </li>
<li> <li>
<div class="text-black text-lg font-bold mb-0">{{ u.coins_spent }}</div> <div class="text-lg font-bold mb-0">{{ u.coins_spent }}</div>
<small class="block font-bold text-gray-500">Dramacoin Spent</small> <small class="block font-bold text-gray-500">Dramacoin Spent</small>
</li> </li>
<li> <li>
<div class="text-black text-lg font-bold mb-0">{{ u.coins }}</div> <div class="text-lg font-bold mb-0">{{ u.coins }}</div>
<small class="block font-bold text-gray-500">Dramacoin Earned</small> <small class="block font-bold text-gray-500">Dramacoin Earned</small>
</li> </li>
{% if u.procoins %} {% if u.procoins %}
<li> <li>
<div class="text-black text-lg font-bold mb-0">{{ u.procoins }}</div> <div class="text-lg font-bold mb-0">{{ u.procoins }}</div>
<small class="block font-bold text-gray-500">MarseyBux</small> <small class="block font-bold text-gray-500">MarseyBux</small>
</li> </li>
{% endif %} {% endif %}

35
files/templates/CHRISTMAS/votes.html
View File

@ -7,7 +7,7 @@
{% block subHeader %} {% block subHeader %}
<div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t"> <div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t">
<div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 rounded-t sub-header-shadow"></div> <div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 dark:bg-none dark:bg-gray-800 rounded-t sub-header-shadow dark:border-b dark:border-gray-700"></div>
<div class="relative col-span-full flex items-center"> <div class="relative col-span-full flex items-center">
<div> <div>
<h1 class="font-bold text-xl font-heading leading-normal mb-0"> <h1 class="font-bold text-xl font-heading leading-normal mb-0">
@ -19,7 +19,7 @@
Back to post Back to post
</a> </a>
{% else %} {% else %}
<small class="block text-gray-700 leading-normal"> <small class="block text-gray-700 dark:text-gray-400 leading-normal">
See which losers downvoted your quality content. See which losers downvoted your quality content.
</small> </small>
{% endif %} {% endif %}
@ -32,21 +32,16 @@
<div class="col-span-full px-2.5 md:px-0"> <div class="col-span-full px-2.5 md:px-0">
{% if thing %} {% if thing %}
<div class="my-4 p-3 bg-gray-400 border border-gray-500 shadow-inset-t-white-10 rounded"> <div class="my-4 p-3 bg-gray-400 dark:bg-gray-800 border border-gray-500 dark:bg-gray-700 shadow-inset-t-white-10 rounded">
<div class="flex items-center space-x-2 mb-2"> <div class="flex items-center space-x-2 mb-2">
<img loading="lazy" src="{{thing.author.profile_url}}" class="flex-shrink-0 p-[3px] border w-8 h-8 object-cover bg-white border-gray-300" alt="{{thing.author.profile_url}} avatar"/> <img loading="lazy" src="{{thing.author.profile_url}}" class="flex-shrink-0 p-[3px] border w-8 h-8 object-cover bg-white border-gray-300" alt="{{thing.author.profile_url}} avatar"/>
<a href="{{thing.author.url}}" class="block text-base font-bold text-black hover:text-red-600 leading-normal"> <a href="{{thing.author.url}}" class="block text-base font-bold text-black dark:text-gray-200 hover:text-primary leading-normal">
@{{thing.author.username}} @{{thing.author.username}}
</a> </a>
<span class="text-sm text-gray-500 leading-normal"> <span class="text-sm text-gray-500 leading-normal">
{{thing.author.created_datetime}} {{thing.author.created_datetime}}
</span> </span>
</div> </div>
<h5 class="font-heading mb-2">
<a href="{{thing.permalink}}" class="text-black hover:text-red-600">
{{ thing.realtitle(v) | safe}}
</a>
</h5>
</div> </div>
<h2 class="text-lg"> <h2 class="text-lg">
@ -55,25 +50,25 @@
<div class="flex flex-col mb-4"> <div class="flex flex-col mb-4">
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<div class="align-middle inline-block min-w-full"> <div class="align-middle inline-block min-w-full">
<div class="flex flex-col bg-gray-100 border border-gray-300 rounded overflow-hidden"> <div class="flex flex-col bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-900 rounded overflow-hidden">
<table class="min-w-full"> <table class="min-w-full">
<thead class="bg-gradient-to-t from-gray-200 to-gray-100"> <thead class="bg-gradient-to-t from-gray-200 to-gray-100">
<tr> <tr>
<th scope="col" class="px-6 py-3 text-left text-xs font-bold text-gray-700 uppercase tracking-wider"> <th scope="col" class="px-6 py-3 text-left text-xs font-bold text-gray-700 dark:text-gray-500 uppercase tracking-wider">
Members Members
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody class="bg-gray-100 divide-y divide-gray-300 border-t border-gray-300"> <tbody class="bg-gray-100 divide-y divide-gray-300 border-t border-gray-300 dark:border-gray-700">
{% if ups %} {% if ups %}
{% for vote in ups %} {% for vote in ups %}
<tr class="shadow-inset-t-white-05 odd:bg-gray-200"> <tr class="shadow-inset-t-white-05 odd:bg-gray-200 dark:bg-gray-700">
<td class="px-6 py-4 whitespace-nowrap"> <td class="px-6 py-4 whitespace-nowrap">
<div class="flex items-center"> <div class="flex items-center">
<img loading="lazy" src="{{vote.user.profile_url}}" class="flex-shrink-0 p-[3px] border w-12 h-12 object-cover {{ 'bg-red-800 border-red-900' if v.username == vote.user.username else 'bg-white border-gray-300' }}" alt="{{ vote.user.username }} avatar"/> <img loading="lazy" src="{{vote.user.profile_url}}" class="flex-shrink-0 p-[3px] border w-12 h-12 object-cover {{ 'bg-red-800 border-red-900' if v.username == vote.user.username else 'bg-white border-gray-300' }}" alt="{{ vote.user.username }} avatar"/>
<!-- User Details --> <!-- User Details -->
<div class="ml-3"> <div class="ml-3">
<a class="block font-bold text-black hover:text-red-600" href="/@{{vote.user.username}}"> <a class="block font-bold text-black dark:text-gray-200 hover:text-primary" href="/@{{vote.user.username}}">
{{vote.user.username}} {{vote.user.username}}
</a> </a>
{% if vote.user.customtitle %} {% if vote.user.customtitle %}
@ -87,7 +82,7 @@
</tr> </tr>
{% endfor %} {% endfor %}
{% else %} {% else %}
<tr class="shadow-inset-t-white-05 odd:bg-gray-200"> <tr class="shadow-inset-t-white-05 odd:bg-gray-200 dark:bg-gray-700">
<td class="px-6 py-4 whitespace-nowrap"> <td class="px-6 py-4 whitespace-nowrap">
<div class="flex items-center text-gray-500"> <div class="flex items-center text-gray-500">
No upvotes yet... No upvotes yet...
@ -112,21 +107,21 @@
<table class="min-w-full"> <table class="min-w-full">
<thead class="bg-gradient-to-t from-gray-200 to-gray-100"> <thead class="bg-gradient-to-t from-gray-200 to-gray-100">
<tr> <tr>
<th scope="col" class="px-6 py-3 text-left text-xs font-bold text-gray-700 uppercase tracking-wider"> <th scope="col" class="px-6 py-3 text-left text-xs font-bold text-gray-700 dark:text-gray-500 uppercase tracking-wider">
Members Members
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody class="bg-gray-100 divide-y divide-gray-300 border-t border-gray-300"> <tbody class="bg-gray-100 divide-y divide-gray-300 border-t border-gray-300 dark:border-gray-700">
{% if downs %} {% if downs %}
{% for vote in downs %} {% for vote in downs %}
<tr class="shadow-inset-t-white-05 odd:bg-gray-200"> <tr class="shadow-inset-t-white-05 odd:bg-gray-200 dark:bg-gray-700">
<td class="px-6 py-4 whitespace-nowrap"> <td class="px-6 py-4 whitespace-nowrap">
<div class="flex items-center"> <div class="flex items-center">
<img loading="lazy" src="{{vote.user.profile_url}}" class="flex-shrink-0 p-[3px] border w-12 h-12 object-cover {{ 'bg-red-800 border-red-900' if v.username == vote.user.username else 'bg-white border-gray-300' }}" alt="{{ vote.user.username }} avatar"/> <img loading="lazy" src="{{vote.user.profile_url}}" class="flex-shrink-0 p-[3px] border w-12 h-12 object-cover {{ 'bg-red-800 border-red-900' if v.username == vote.user.username else 'bg-white border-gray-300' }}" alt="{{ vote.user.username }} avatar"/>
<!-- User Details --> <!-- User Details -->
<div class="ml-3"> <div class="ml-3">
<a class="block font-bold text-black hover:text-red-600" href="/@{{vote.user.username}}"> <a class="block font-bold text-black hover:text-primary" href="/@{{vote.user.username}}">
{{vote.user.username}} {{vote.user.username}}
</a> </a>
{% if vote.user.customtitle %} {% if vote.user.customtitle %}
@ -140,7 +135,7 @@
</tr> </tr>
{% endfor %} {% endfor %}
{% else %} {% else %}
<tr class="shadow-inset-t-white-05 odd:bg-gray-200"> <tr class="shadow-inset-t-white-05 odd:bg-gray-200 dark:bg-gray-700">
<td class="px-6 py-4 whitespace-nowrap"> <td class="px-6 py-4 whitespace-nowrap">
<div class="flex items-center text-gray-500"> <div class="flex items-center text-gray-500">
No downvotes yet... No downvotes yet...