diff --git a/package-lock.json b/package-lock.json index 5bbc435..54262f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,8 @@ "@astrojs/rss": "^4.0.10", "@astrojs/sitemap": "3.2.1", "@astrojs/tailwind": "^5.1.4", - "@fontsource-variable/inter": "^5.1.0", + "@fontsource-variable/outfit": "^5.1.1", + "@fontsource-variable/playwrite-ca": "^5.1.1", "@fontsource-variable/red-hat-mono": "^5.1.0", "astro": "^5.1.1", "astro-icon": "^1.1.4", @@ -776,10 +777,16 @@ "node": ">=12" } }, - "node_modules/@fontsource-variable/inter": { + "node_modules/@fontsource-variable/outfit": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@fontsource-variable/inter/-/inter-5.1.1.tgz", - "integrity": "sha512-OpXFTmiH6tHkYijMvQTycFKBLK4X+SRV6tet1m4YOUH7SzIIlMqDja+ocDtiCA72UthBH/vF+3ZtlMr2rN/wIw==", + "resolved": "https://registry.npmjs.org/@fontsource-variable/outfit/-/outfit-5.1.1.tgz", + "integrity": "sha512-XuzmITw6zWt3nUINJVAk99f0TgXJ9ZCt3qERAr0t89Em6RbqQ4x6skmxsIgjzkLHVzmoqf3AzCbxvpk/kNnu5A==", + "license": "OFL-1.1" + }, + "node_modules/@fontsource-variable/playwrite-ca": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@fontsource-variable/playwrite-ca/-/playwrite-ca-5.1.1.tgz", + "integrity": "sha512-982bgK4zGM3KjjXvrBo5virq2jLHJHbQw3gFG9krR5PoFqq00tcNNSAa4ns6gf7wNKjQFk6Pz2OAPj/KPoEJAQ==", "license": "OFL-1.1" }, "node_modules/@fontsource-variable/red-hat-mono": { diff --git a/package.json b/package.json index d3838a0..5d36941 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "@astrojs/rss": "^4.0.10", "@astrojs/sitemap": "3.2.1", "@astrojs/tailwind": "^5.1.4", - "@fontsource-variable/inter": "^5.1.0", + "@fontsource-variable/outfit": "^5.1.1", + "@fontsource-variable/playwrite-ca": "^5.1.1", "@fontsource-variable/red-hat-mono": "^5.1.0", "astro": "^5.1.1", "astro-icon": "^1.1.4", diff --git a/src/components/Head.astro b/src/components/Head.astro index 224821a..453ade7 100644 --- a/src/components/Head.astro +++ b/src/components/Head.astro @@ -20,7 +20,7 @@ if (typeof tags !== "undefined") { tags = SITE.KEYWORDS.concat(tags); } -import inter from "@fontsource-variable/inter/files/inter-latin-wght-normal.woff2?url"; +import outfit from "@fontsource-variable/outfit/files/outfit-latin-wght-normal.woff2?url"; import redhatmono from "@fontsource-variable/red-hat-mono/files/red-hat-mono-latin-wght-normal.woff2?url"; --- @@ -103,7 +103,7 @@ import redhatmono from "@fontsource-variable/red-hat-mono/files/red-hat-mono-lat rel="preload" as="font" type="font/woff2" - href={inter} + href={outfit} crossorigin="anonymous" /> +

+ Digital designer based in the United Kingdom. +

+ diff --git a/src/components/Prose.astro b/src/components/Prose.astro index dac3ef5..58b6c87 100644 --- a/src/components/Prose.astro +++ b/src/components/Prose.astro @@ -1,5 +1,5 @@
diff --git a/src/components/RelatedArticles.astro b/src/components/RelatedArticles.astro index 7e9ae53..2adf9f8 100644 --- a/src/components/RelatedArticles.astro +++ b/src/components/RelatedArticles.astro @@ -18,43 +18,43 @@ const prev = items[(index - 1 + items.length) % items.length]; const next = items[(index + 1) % items.length]; --- -
-
- - - - -

- {prev.data.title} -

-
-
-
- -

- {next.data.title} -

-
- - - -
-
+{ + items.length > 1 ? ( +
+
+ + + + +

+ {prev.data.title} +

+
+
+
+ +

+ {next.data.title} +

+
+ + + +
+
+ ) : null +} diff --git a/src/components/ShowcaseProject.astro b/src/components/ShowcaseProject.astro index 6f6dd20..1e96cdc 100644 --- a/src/components/ShowcaseProject.astro +++ b/src/components/ShowcaseProject.astro @@ -11,31 +11,28 @@ const { collection } = Astro.props;
  • {collection.data.image.alt} -
    -
    +

    {collection.data.title}

    { collection.data.collection ? ( diff --git a/src/content/projects/a-long-way-down/index.mdx b/src/content/projects/a-long-way-down/index.mdx index 459bc3b..3c86478 100644 --- a/src/content/projects/a-long-way-down/index.mdx +++ b/src/content/projects/a-long-way-down/index.mdx @@ -1,6 +1,6 @@ --- title: "A Long Way Down (Demo)" -description: "A Long Way Down is a short, atmospheric linear adventure created alongside my friend and teammate Sam as a project for our FdA Games and Interactive Design degree." +description: "A short, atmospheric linear adventure created for my FdA Games and Interactive Design degree." date: 2023-05-11 updated: 2023-05-11 featured: true diff --git a/src/content/projects/camouflage-store/index.mdx b/src/content/projects/camouflage-store/index.mdx index 17b5ae0..b528068 100644 --- a/src/content/projects/camouflage-store/index.mdx +++ b/src/content/projects/camouflage-store/index.mdx @@ -45,7 +45,7 @@ _Previous design_ Along with the switch of platform, we came to the decision that the domain and overall branding would need to be updated to to go along with the rest of the work being done. I felt it was important however that the original red colour of `#dd3e3e` was kept as it was a key part of the brand from all the way back in 2007. -For the domain, we have gone with [camouflagestore.uk](https://camouflagestore.uk) (and its equavalent .co.uk tld). This was chosen as the location of the store is a key factor in its identity, and having this represented from the geto go meant a lot to the client. The legacy domain of [camouflage-store.com](https://camouflage-store.com) has also been kept since it has also been with Steve since 2007 and holds significant personal value. +For the domain, we have gone with [camouflagestore.uk](https://camouflagestore.uk) (and its equavalent .co.uk tld). This was chosen as the location of the store is a key factor in its identity, and having this represented from the get-go meant a lot to the client. The legacy domain of [camouflage-store.com](https://camouflage-store.com) has also been kept since it has also been with Steve since 2007 and holds significant personal value. ## VPS diff --git a/src/pages/index.astro b/src/pages/index.astro index d58829f..dfabcc3 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -2,9 +2,9 @@ import Layout from "@layouts/Layout.astro"; import { HOME } from "@consts"; import { getCollection } from "astro:content"; -import { Icon } from "astro-icon/components"; import ShowcaseProject from "@components/ShowcaseProject.astro"; import ShowcasePost from "@components/ShowcasePost.astro"; +import Hero from "@components/Hero.astro"; const posts = (await getCollection("posts")) .filter((post) => !post.data.draft) @@ -18,58 +18,59 @@ const projects = (await getCollection("projects")) --- -
    -
    + +
    +
      {projects.map((project) => )}
    + { + projects.length > 1 ? ( + + {" "} +
    + View all +
    +
    + ) : null + }
    -
    +
      {posts.map((post) => )}
    + { + posts.length > 1 ? ( + + {" "} +
    + View all +
    +
    + ) : null + }
    diff --git a/src/styles/global.css b/src/styles/global.css index c7bb20f..dcb83cf 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -1,5 +1,6 @@ -@import "@fontsource-variable/inter"; @import "@fontsource-variable/red-hat-mono"; +@import "@fontsource-variable/outfit"; +@import "@fontsource-variable/playwrite-ca"; @tailwind base; @tailwind components; diff --git a/tailwind.config.ts b/tailwind.config.ts index 288c4a8..21cbb75 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -6,7 +6,7 @@ export default { theme: { extend: { fontFamily: { - sans: ["'Inter Variable'", ...defaultTheme.fontFamily.sans], + sans: ["'Outfit Variable'", ...defaultTheme.fontFamily.sans], serif: [...defaultTheme.fontFamily.serif], mono: ["'Red Hat Mono Variable'", ...defaultTheme.fontFamily.mono], }, @@ -20,6 +20,9 @@ export default { animation: { reveal: "reveal 0.3s forwards ease-in-out", logo: "logo 1s forwards ease-out", + "gradient-x": "gradient-x 6s ease infinite", + "gradient-y": "gradient-y 6s ease infinite", + "gradient-xy": "gradient-xy 6s ease infinite", }, keyframes: { reveal: { @@ -44,6 +47,36 @@ export default { color: "hsl(var(--secondary))", }, }, + "gradient-y": { + "0%, 100%": { + "background-size": "400% 400%", + "background-position": "center top", + }, + "50%": { + "background-size": "200% 200%", + "background-position": "center center", + }, + }, + "gradient-x": { + "0%, 100%": { + "background-size": "200% 200%", + "background-position": "left center", + }, + "50%": { + "background-size": "200% 200%", + "background-position": "right center", + }, + }, + "gradient-xy": { + "0%, 100%": { + "background-size": "400% 400%", + "background-position": "left center", + }, + "50%": { + "background-size": "200% 200%", + "background-position": "right center", + }, + }, }, }, plugins: [require("@tailwindcss/typography")],