opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Remove duplication of prose classes

Browse source
This commit is contained in:
Oliver Davies 2025-07-15 23:09:00 +01:00
parent 2b58a18507
commit b13d4d64b1
13 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/opd_daily_emails/src/Form/KitSubscriptionForm.php
View file

@ -6,6 +6,7 @@ namespace Drupal\opd_daily_emails\Form;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Site\Settings;
final class KitSubscriptionForm extends FormBase {
@ -26,7 +27,7 @@ final class KitSubscriptionForm extends FormBase {
'#type' => 'html_tag',
'#tag' => 'div',
'#attributes' => [
'class' => 'prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[\'\'] prose-code:after:content-[\'\'] prose-pre:bg-neutral-100 prose-pre:text-black prose-pre:rounded-none prose-code:bg-neutral-100',
'class' => Settings::get('prose_classes'),
'style' => 'margin-bottom: 1rem;',
],
];

3
settings.php
View file

@ -881,3 +881,6 @@ $databases['default']['default'] = array (
);
$settings['tome_sync_encoder'] = 'yaml';
$settings['prose_classes'] = 'prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[\'\'] prose-code:after:content-[\'\'] prose-pre:bg-neutral-100 prose-pre:text-black prose-pre:rounded-none prose-code:bg-neutral-100';

2
themes/opdavies/components/testimonial.html.twig
View file

@ -1,5 +1,5 @@
<article>
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-grey-400 prose-code:before:content-[''] prose-code:after:content-['']">
<div class="{{ prose_classes }}">
<blockquote>
{{ text }}
</blockquote>

9
themes/opdavies/opdavies.theme Normal file
View file

@ -0,0 +1,9 @@
<?php
declare(strict_types=1);
use Drupal\Core\Site\Settings;
function opdavies_preprocess(array &$variables): void {
$variables['prose_classes'] = Settings::get('prose_classes');
}

3
themes/opdavies/templates/email-signup-form.html.twig
View file

@ -77,8 +77,7 @@
</div>
<footer class="px-4 mt-4 text-center">
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-['']
">
<div class="{{ prose_classes }}">
<p>Not sure? <a href="/archive">Browse the archive →</a></p>
</div>
</footer>

4
themes/opdavies/templates/field--body.html.twig
View file

@ -44,10 +44,6 @@
]
%}
{%
set prose_classes = "prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-[''] prose-pre:bg-neutral-100 prose-pre:text-black prose-pre:rounded-none prose-code:bg-neutral-100"
%}
{% if label_hidden %}
{% if multiple %}
<div{{ attributes }}>

2
themes/opdavies/templates/node--podcast-episode--full.html.twig
View file

@ -69,7 +69,7 @@
{% endif %}
{{ title_suffix }}
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-['']">
<div>
{% if display_submitted %}
<div class="my-2 text-base">
{% set created = node.getCreatedTime() %}

2
themes/opdavies/templates/node--podcast-episode.html.twig
View file

@ -69,7 +69,7 @@
{% endif %}
{{ title_suffix }}
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-['']">
<div class="{{ prose_classes }}">
{% if display_submitted %}
<div class="my-2 text-base">
{% set created = node.getCreatedTime() %}

1
themes/opdavies/templates/node--testimonial.html.twig
View file

@ -67,6 +67,7 @@
uri: node.field_image|file_uri,
},
name: label,
prose_classes: prose_classes,
role: content.field_role.0|render,
text: content.body.0|render,
url: content.field_url.0['#url']|render,

2
themes/opdavies/templates/page.html.twig
View file

@ -106,7 +106,7 @@
<img src="/assets/images/social-avatar.jpg" alt="Picture of Oliver" class="my-0 w-16 h-16 rounded-full ring-[3px] ring-blue-primary dark:ring-white">
</div>
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-['']">
<div class="{{ prose_classes }}">
<p>I'm a certified Drupal Triple Expert and former Drupal Association staff member with 18 years of experience, a Drupal core contributor, <a href="/presentations">public speaker</a>, <a href="https://www.youtube.com/@opdavies/streams">live streamer</a>, and host of the <a href="/podcast">Beyond Blocks podcast</a>.</p>
</div>
</div>

2
themes/opdavies/templates/views-view--daily-email-archive.html.twig
View file

@ -42,7 +42,7 @@
{{ title }}
{{ title_suffix }}
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-['']">
<div class="{{ prose_classes }}">
{% if header %}
<header>
{{ header }}

2
themes/opdavies/templates/views-view--podcast-episodes.html.twig
View file

@ -44,7 +44,7 @@
<div>
{% if header %}
<header class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-['']">
<header class="{{ prose_classes }}">
{{ header }}
</header>
{% endif %}

2
themes/opdavies/templates/views-view--recent-daily-emails.html.twig
View file

@ -42,7 +42,7 @@
{{ title }}
{{ title_suffix }}
<div class="prose prose-p:text-black prose-a:font-light prose-a:text-blue-primary prose-p:text-lg prose-blockquote:border-blue-primary dark:marker:text-white prose-li:my-1 prose-li:text-lg prose-figcaption:text-white prose-li:text-black marker:text-black dark:prose-p:text-white dark:prose-invert dark:prose-a:text-blue-400 dark:prose-blockquote:border-blue-400 dark:prose-li:text-white prose-a:hover:no-underline prose-h2:text-xl prose-code:font-normal prose-h2:mb-4 prose-ul:my-3 dark:prose-hr:border-neutral-400 prose-code:before:content-[''] prose-code:after:content-[''] prose-pre:bg-neutral-100 prose-pre:text-black prose-pre:rounded-none prose-code:bg-neutral-100">
<div class="{{ prose_classes }}">
{% if header %}
<header>
{{ header }}