From d5eaadf2e8ee8cccb2c046c1553e8c5275901e24 Mon Sep 17 00:00:00 2001 From: Julio Estrada Date: Mon, 22 Apr 2024 15:00:31 -0400 Subject: [PATCH] Remove Cairo font and update font-family with a modern system font stack --- docstailwind.config.js | 5 ----- frontend/docsstyles.css | 14 ++++++-------- frontend/styles.css | 1 - frontend/userguidestyles.css | 4 ++-- static/css/styles.css | 8 -------- tailwind.config.js | 5 ----- templates/base.html | 14 +------------- templates/includes/_header.html | 2 +- userguidetailwind.config.js | 5 ----- 9 files changed, 10 insertions(+), 48 deletions(-) diff --git a/docstailwind.config.js b/docstailwind.config.js index eff6bd22..51d1d305 100644 --- a/docstailwind.config.js +++ b/docstailwind.config.js @@ -27,11 +27,6 @@ module.exports = { bronze: '#BB8A56', silver: '#B5C9D3', }, - extend: { - fontFamily: { - cairo: "'Cairo', sans-serif", - }, - }, }, variants: { extend: {}, diff --git a/frontend/docsstyles.css b/frontend/docsstyles.css index e2e30919..54c6b650 100644 --- a/frontend/docsstyles.css +++ b/frontend/docsstyles.css @@ -6,9 +6,7 @@ } body { - @apply max-w-7xl mx-auto md:pt-11 md:px-6 my-0; - @apply h-screen font-cairo; - @apply font-cairo; + @apply max-w-7xl mx-auto md:pt-11 md:px-6 my-0 h-screen; } hr:first-of-type { @@ -21,11 +19,11 @@ hr:first-of-type { div.section:first-of-type, -div.spirit-nav:first-of-type,, -div.copyright-footer:first-of-type,, -div.chapter:first-of-type,, -div.refentry:first-of-type,, -div.book:first-of-type, { +div.spirit-nav:first-of-type, +div.copyright-footer:first-of-type, +div.chapter:first-of-type, +div.refentry:first-of-type, +div.book:first-of-type { @apply max-w-7xl px-3 md:px-6 mx-auto; } diff --git a/frontend/styles.css b/frontend/styles.css index aba7f04b..ca99cb4a 100644 --- a/frontend/styles.css +++ b/frontend/styles.css @@ -14,7 +14,6 @@ body { @apply text-slate dark:text-white; - @apply font-cairo; } h1 { @apply text-6xl; diff --git a/frontend/userguidestyles.css b/frontend/userguidestyles.css index 54b13c34..da3d7474 100644 --- a/frontend/userguidestyles.css +++ b/frontend/userguidestyles.css @@ -11,8 +11,8 @@ html { } body { - @apply h-screen font-cairo dark:bg-black dark:!text-white; - @apply font-cairo; + @apply h-screen dark:bg-black dark:!text-white; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } p a:link, p a:visited, table a, .title a { diff --git a/static/css/styles.css b/static/css/styles.css index 7669b061..bbb182b6 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -602,10 +602,6 @@ body { color: rgb(255 255 255 / var(--tw-text-opacity)); } -body { - font-family: 'Cairo', sans-serif; -} - h1 { font-size: 3.75rem; line-height: 1; @@ -2749,10 +2745,6 @@ code, vertical-align: bottom; } -.font-cairo { - /* font-family: 'Cairo', sans-serif; */ -} - .text-5xl { font-size: 3rem; line-height: 1; diff --git a/tailwind.config.js b/tailwind.config.js index e7b3b533..fce4a403 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -27,11 +27,6 @@ module.exports = { bronze: '#BB8A56', silver: '#B5C9D3', }, - extend: { - fontFamily: { - cairo: "'Cairo', sans-serif", - }, - }, }, variants: { extend: {}, diff --git a/templates/base.html b/templates/base.html index 086dcc2b..816feeaf 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,19 +3,7 @@ - - - - {% block title %}Boost{% endblock %} @@ -52,7 +40,7 @@ el.setAttribute('content', el.getAttribute('data-' + m)); }); }" - class="h-screen bg-gray-200 dark:bg-black font-cairo" {% block body_id %}{% endblock %}> + class="h-screen bg-gray-200 dark:bg-black" {% block body_id %}{% endblock %}>
{% block content_header %} diff --git a/templates/includes/_header.html b/templates/includes/_header.html index 1f3a510e..e8ebb30a 100644 --- a/templates/includes/_header.html +++ b/templates/includes/_header.html @@ -29,7 +29,7 @@