diff --git a/assets/css/base.pcss b/assets/css/base.pcss index 8b1378917..0ef2aeaee 100644 --- a/assets/css/base.pcss +++ b/assets/css/base.pcss @@ -1 +1,5 @@ - +@layer base { + h2 { + @apply font-bold + } +} diff --git a/assets/css/tailwind.pcss b/assets/css/tailwind.pcss index 4879a4c02..b3952650d 100644 --- a/assets/css/tailwind.pcss +++ b/assets/css/tailwind.pcss @@ -5,4 +5,3 @@ @import './base.pcss'; @import './components.pcss'; @import './utilities.pcss'; - diff --git a/source/_layouts/app.html.twig b/source/_layouts/app.html.twig index 33e7f454e..8981f50cf 100644 --- a/source/_layouts/app.html.twig +++ b/source/_layouts/app.html.twig @@ -6,6 +6,8 @@ {{ site.name|default('Sculpin Skeleton') }} + + {% block body %}{% endblock %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 6a9c586a0..0e594c631 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,16 +1,17 @@ {% extends 'app' %} {% block body %} - Skip to main content +
+ Skip to main content - {% include 'navbar' %} + {% include 'navbar' %} - -
-
- {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} +
+
+ {% block content_wrapper %} + {% block content %}{% endblock %} + {% endblock %} +
{% endblock %} diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig index 59c9bf328..d2aecb3f7 100644 --- a/source/_layouts/page.html.twig +++ b/source/_layouts/page.html.twig @@ -2,7 +2,7 @@ {% block content_wrapper %}
-

{{ page.title }}

+

{{ page.title }}

{{ parent() }}
diff --git a/source/_pages/talks.html.twig b/source/_pages/talks.html.twig index a690be568..4450ed79c 100644 --- a/source/_pages/talks.html.twig +++ b/source/_pages/talks.html.twig @@ -4,14 +4,20 @@ use: - talks --- -{% for talk in data.talks|sort((a,b) => a.sortable_date < b.sortable_date) %} -
-

- - {{ talk.title }} - -

+

After giving my first talk in September 2012, I have now given 81 presentations and workshops at various conferences and meetups, in-person and remotely, on topics including PHP, Drupal, automated testing, Git, CSS, and systems administration.

-

{{ talk.description }}

-
-{% endfor %} +
+
+ {% for talk in data.talks|sort((a,b) => a.sortable_date < b.sortable_date) %} + + {% endfor %} +
+
diff --git a/source/_partials/navbar.html.twig b/source/_partials/navbar.html.twig index 02ba20fdd..adca2997f 100644 --- a/source/_partials/navbar.html.twig +++ b/source/_partials/navbar.html.twig @@ -1,14 +1,13 @@ -
-
+
+
diff --git a/tailwind.config.js b/tailwind.config.js index 2b63ef44b..e7b804bd2 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -19,57 +19,17 @@ module.exports = { extend: { typography: (theme) => ({ DEFAULT: { - css: { - a: { - color: theme('colors.blue.700') - }, - code: { - backgroundColor: theme('colors.gray.150'), - fontWeight: theme('fontWeight.normal'), - paddingBottom: theme('spacing.px'), - paddingLeft: theme('spacing.1'), - paddingRight: theme('spacing.1'), - paddingTop: theme('spacing.px') - }, - h2: { - marginBottom: theme('spacing.2'), - marginTop: theme('spacing.8') - }, - pre: { - backgroundColor: theme('colors.gray.150'), - borderRadius: '0', - color: theme('colors.gray.800'), - padding: theme('spacing.6') - }, - 'code::before': false, - 'code::after': false, - 'pre code::before': false, - 'pre code::after': false - } - }, - dark: { - css: { - color: theme('colors.gray.200'), - - code: { - backgroundColor: theme('colors.gray.750'), - color: theme('colors.gray.200') - }, - - 'blockquote, h2, h3': { - color: theme('colors.white') - }, - - strong: { - color: theme('colors.gray.200') + css: { + p: { + lineHeight: 400 + } } - } } }), colors, fontFamily: { sans: [ - 'Inter', + 'Roboto Condensed', 'Arial', 'Helvetica Neue', 'Helvetica',