Resolve conflicts

pull/715/head
Alex Jackson 2023-07-18 00:11:43 +01:00
parent 53d1940df1
commit 9b19dd169a
5 changed files with 53 additions and 3062 deletions

3
.gitignore vendored
View File

@ -19,5 +19,8 @@ hugo.linux
# Lighthouse generated output # Lighthouse generated output
.lighthouseci .lighthouseci
# Compiled CSS
/assets/css/compiled
# Project specific files # Project specific files
TODO TODO

File diff suppressed because it is too large Load Diff

View File

@ -3,6 +3,10 @@
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
p {
@apply text-justify;
}
body a, body a,
body button { body button {
@apply transition-colors; @apply transition-colors;

View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!
Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License -
https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
<path fill="currentColor"
d="M96 96c0-35.3 28.7-64 64-64H448c35.3 0 64 28.7 64 64V416c0 35.3-28.7 64-64 64H80c-44.2 0-80-35.8-80-80V128c0-17.7 14.3-32 32-32s32 14.3 32 32V400c0 8.8 7.2 16 16 16s16-7.2 16-16V96zm64 24v80c0 13.3 10.7 24 24 24H296c13.3 0 24-10.7 24-24V120c0-13.3-10.7-24-24-24H184c-13.3 0-24 10.7-24 24zm208-8c0 8.8 7.2 16 16 16h48c8.8 0 16-7.2 16-16s-7.2-16-16-16H384c-8.8 0-16 7.2-16 16zm0 96c0 8.8 7.2 16 16 16h48c8.8 0 16-7.2 16-16s-7.2-16-16-16H384c-8.8 0-16 7.2-16 16zM160 304c0 8.8 7.2 16 16 16H432c8.8 0 16-7.2 16-16s-7.2-16-16-16H176c-8.8 0-16 7.2-16 16zm0 96c0 8.8 7.2 16 16 16H432c8.8 0 16-7.2 16-16s-7.2-16-16-16H176c-8.8 0-16 7.2-16 16z" />
</svg>

After

Width:  |  Height:  |  Size: 915 B

View File

@ -7,8 +7,8 @@ module.exports = {
], ],
darkMode: "class", darkMode: "class",
theme: { theme: {
extend: {
colors: { colors: {
transparent: "transparent",
neutral: { neutral: {
DEFAULT: "rgba(var(--color-neutral), <alpha-value>)", DEFAULT: "rgba(var(--color-neutral), <alpha-value>)",
50: "rgba(var(--color-neutral-50), <alpha-value>)", 50: "rgba(var(--color-neutral-50), <alpha-value>)",
@ -47,7 +47,6 @@ module.exports = {
900: "rgba(var(--color-secondary-900), <alpha-value>)", 900: "rgba(var(--color-secondary-900), <alpha-value>)",
}, },
}, },
extend: {
typography: ({ theme }) => ({ typography: ({ theme }) => ({
DEFAULT: { DEFAULT: {
css: { css: {