diff --git a/package.json b/package.json index de5edf74..a858d2b4 100644 --- a/package.json +++ b/package.json @@ -29,15 +29,15 @@ "@nuxt/content": "1.11.1", "@nuxt/typescript-runtime": "2.0.0", "core-js": "3.8.0", - "nuxt": "2.14.7", + "nuxt": "2.14.9", "prism-themes": "1.5.0" }, "devDependencies": { "@commitlint/cli": "11.0.0", "@commitlint/config-conventional": "11.0.0", - "@nuxt/types": "2.14.7", + "@nuxt/types": "2.14.9", "@nuxt/typescript-build": "2.0.3", - "@nuxtjs/color-mode": "2.0.0", + "@nuxtjs/color-mode": "2.0.1", "@nuxtjs/composition-api": "0.16.4", "@nuxtjs/eslint-config": "5.0.0", "@nuxtjs/eslint-config-typescript": "5.0.0", @@ -45,7 +45,7 @@ "@nuxtjs/html-validator": "0.1.4", "@nuxtjs/pwa": "3.3.2", "@nuxtjs/stylelint-module": "4.0.0", - "@nuxtjs/tailwindcss": "3.2.0", + "@nuxtjs/tailwindcss": "3.3.1", "@vue/test-utils": "1.1.1", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", @@ -53,7 +53,7 @@ "eslint": "7.14.0", "eslint-config-prettier": "6.15.0", "eslint-plugin-nuxt": "2.0.0", - "eslint-plugin-prettier": "3.1.4", + "eslint-plugin-prettier": "3.2.0", "husky": "4.3.0", "jest": "26.6.3", "jest-serializer-vue-tjw": "3.15.0", diff --git a/src/components/GithubRepos.vue b/src/components/GithubRepos.vue index 33ae0231..89b6ff27 100644 --- a/src/components/GithubRepos.vue +++ b/src/components/GithubRepos.vue @@ -7,7 +7,9 @@ :aria-label="`GitHub repository for ${repo}`" >
- + + +
{{ repo }}
@@ -33,7 +35,7 @@ @@ -78,10 +80,16 @@ export default defineComponent({ .list { > * { @apply overflow-hidden; + + svg { + height: 1em; + width: 1em; + fill: currentColor; + } article > :first-child { @apply absolute flex top-0 right-0 p-1; - color: var(--text, theme('colors.muted')); + color: var(--text, theme('colors.gray.300')); > * { @apply z-10; diff --git a/src/components/icons/GithubCircle.vue b/src/components/icons/GithubCircle.vue deleted file mode 100644 index 9fd040d8..00000000 --- a/src/components/icons/GithubCircle.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - diff --git a/src/components/icons/github.vue b/src/components/icons/github.vue new file mode 100644 index 00000000..0138abda --- /dev/null +++ b/src/components/icons/github.vue @@ -0,0 +1,19 @@ + + + diff --git a/src/components/icons/linkedin.vue b/src/components/icons/linkedin.vue new file mode 100644 index 00000000..2efa7e73 --- /dev/null +++ b/src/components/icons/linkedin.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/components/icons/twitter.vue b/src/components/icons/twitter.vue new file mode 100644 index 00000000..a18e83bd --- /dev/null +++ b/src/components/icons/twitter.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/components/layout/TheSiteFooter.vue b/src/components/layout/TheSiteFooter.vue index 3d0020f7..52c1d082 100644 --- a/src/components/layout/TheSiteFooter.vue +++ b/src/components/layout/TheSiteFooter.vue @@ -1,13 +1,51 @@ - @@ -18,14 +13,14 @@ import { defineComponent } from '@nuxtjs/composition-api' export default defineComponent({ + data: () => ({ page: null as any }), + async fetch() { + this.page = await this.$content(`index`).fetch() + }, head: { title: 'Daniel Roe', meta: [{ hid: 'og:title', property: 'og:title', content: `Daniel Roe` }], }, - async fetch() { - this.page = await this.$content(`index`).fetch() - }, - data: () => ({ page: null as any }), }) diff --git a/src/pages/work.vue b/src/pages/work.vue index 006280a9..06fff95a 100644 --- a/src/pages/work.vue +++ b/src/pages/work.vue @@ -3,13 +3,17 @@

Work

+
- + +
+ +
@@ -18,48 +22,48 @@ import { defineComponent } from '@nuxtjs/composition-api' const clients = { - Comcast: require('~/assets/images/work/comcast.svg?inline'), - 'Durham University': require('~/assets/images/work/durham-university.svg?inline'), - 'Parent Scheme': require('~/assets/images/work/parentscheme.svg?inline'), - Concision: require('~/assets/images/work/concision.svg?inline'), - 'North East Local Enterprise Partnership': require('~/assets/images/work/nelep.png?inline'), - Convoke: require('~/assets/images/work/convoke.png?inline'), - 'Acadian Software': require('~/assets/images/work/acadian-software.svg?inline'), + Comcast: require('~/assets/images/work/comcast.svg'), + 'Durham University': require('~/assets/images/work/durham-university.svg'), + 'Parent Scheme': require('~/assets/images/work/parentscheme.svg'), + Concision: require('~/assets/images/work/concision.svg'), + 'North East Local Enterprise Partnership': require('~/assets/images/work/nelep.png'), + Convoke: require('~/assets/images/work/convoke.png'), + 'Acadian Software': require('~/assets/images/work/acadian-software.svg'), } export default defineComponent({ - head: { - title: 'Work', - }, setup() { return { clients, } }, + head: { + title: 'Work', + }, })