From bf7f9db10cfcb5f28fff224fdbb2b4d459896f30 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 4 Oct 2018 00:15:54 +0100 Subject: [PATCH] Adjust spacing and colours --- assets/sass/components/markdown.sass | 32 ++++++++++++++-------------- source/_layouts/base.html.twig | 6 +++--- tailwind.js | 1 + 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/assets/sass/components/markdown.sass b/assets/sass/components/markdown.sass index a24c2bad..bedb39fa 100644 --- a/assets/sass/components/markdown.sass +++ b/assets/sass/components/markdown.sass @@ -1,32 +1,32 @@ .markdown h2 - @apply .mt-8 .mb-2 + @apply mt-8 mb-3 text-black - h3 - @apply .mt-6 .mb-2 + h2, h3 + @apply text-black p, li a - @apply .link + @apply link code - @apply .bg-grey-lighter .inline-block .font-mono .text-xs + @apply bg-grey-lighter inline-block font-mono text-xs padding: 1px 3px p:last-child - @apply .mb-0 + @apply mb-0 pre code, .hljs - @apply .bg-grey-lighter - @apply .block - @apply .border-grey-dark - @apply .border-l-4 - @apply .font-mono - @apply .leading-loose - @apply .overflow-x-scroll - @apply .p-4 - @apply .rounded - @apply .text-xs + @apply bg-grey-lighter + @apply block + @apply border-grey-dark + @apply border-l-4 + @apply font-mono + @apply leading-loose + @apply overflow-x-scroll + @apply p-4 + @apply rounded + @apply text-xs diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index c3de2693..4a94eee0 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -1,5 +1,5 @@ - + {% if page.title is defined and page.url != '//' %} @@ -21,12 +21,12 @@ <link rel="icon" href="{{ site.favicon.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}"> {% endfor %} </head> - <body class="font-sans text-black text-sm leading-normal"> + <body class="font-sans leading-normal"> <div id="app" v-cloak> {% include 'layout/navbar' %} <div class="container mx-auto px-4"> - <div class="md:flex -mx-4"> + <div class="text-grey-darkest md:flex -mx-4"> <main class="md:w-2/3 lg:w-3/4 px-4 mb-8 lg:mb-0" role="main"> {% block content_top %}{% endblock %} {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} diff --git a/tailwind.js b/tailwind.js index ce447743..b668a89a 100644 --- a/tailwind.js +++ b/tailwind.js @@ -233,6 +233,7 @@ module.exports = { '4': '1rem', '6': '1.5rem', '8': '2rem', + '10': '2.5rem', '12': '3rem', '16': '4rem', },