Skip to content

Commit

Permalink
Merge branch 'dev' into add-user-site-joush007
Browse files Browse the repository at this point in the history
  • Loading branch information
nunocoracao authored Oct 27, 2023
2 parents 49df416 + 9056c29 commit 838b443
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
ref: "${{ github.head_ref }}"
- name: Install dependencies and Build Theme
uses: actions/setup-node@v3
uses: actions/setup-node@v4
- run: npm install
- run: npm run assets
- name: Commit and push Chart.js changes
Expand Down
2 changes: 1 addition & 1 deletion assets/css/compiled/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Blowfish | MIT License | https://github.com/nunocoracao/blowfish */

/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com */
/*! tailwindcss v3.3.4 | MIT License | https://tailwindcss.com */

/*
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
Expand Down
7 changes: 7 additions & 0 deletions exampleSite/content/users/users.json
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,13 @@
"Technology Blog"
]
},
{
"title": "kylemalloy.com",
"url": "https://kylemalloy.com",
"tags": [
"Personal site"
]
},
{
"title": "joush007.github.io",
"url": "https://joush007.github.io",
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"prettier-plugin-tailwindcss": "^0.5.6",
"puppeteer": "^21.3.8",
"rimraf": "^5.0.5",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.3.4",
"tw-elements": "1.0.0",
"typeit": "^8.7.1",
"vendor-copy": "^3.0.1"
Expand Down Expand Up @@ -97,6 +97,6 @@
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"@tailwindcss/forms": "^0.5.6",
"commander": "^11.0.0"
"commander": "^11.1.0"
}
}

0 comments on commit 838b443

Please sign in to comment.