Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
auguwu committed Aug 11, 2024
1 parent 964b5ad commit 164a0f3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 56 deletions.
3 changes: 2 additions & 1 deletion astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* SOFTWARE.
*/

import githubAlerts from 'remark-github-alerts';
import { defineConfig } from 'astro/config';
import tailwind from '@astrojs/tailwind';
import sitemap from '@astrojs/sitemap';
Expand All @@ -34,7 +35,7 @@ export default defineConfig({
output: 'server',
site: 'https://floofy.dev',
markdown: {
remarkPlugins: [twemoji],
remarkPlugins: [twemoji, githubAlerts],
syntaxHighlight: 'shiki',
shikiConfig: {
theme: 'poimandres',
Expand Down
Binary file modified bun.lockb
Binary file not shown.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"astro-icon": "1.1.0",
"autoprefixer": "10.4.20",
"pino": "9.3.2",
"remark-github-alerts": "0.0.4",
"remark-twemoji": "0.1.1",
"tailwindcss": "3.4.9",
"twemoji": "14.0.2"
Expand Down
52 changes: 0 additions & 52 deletions src/content/blog/bun.md

This file was deleted.

11 changes: 9 additions & 2 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const projects: Props['data'][] = [
}
];
// if any mutuals I know want to be added, you can DM me on Discord (@auguwu)
// or submit a PR if you wish :3
const friends = [
{
friend: 'Spotlight',
Expand All @@ -32,8 +34,13 @@ const friends = [
friend: 'Alula',
img: 'https://alula.me/webring/alula.png',
url: 'https://alula.me'
},
{
friend: 'Ovyerus',
img: 'https://ovyerus.com/webring/ovyerus.png',
url: 'https://ovyerus.com'
}
];
] as const;
---

<html lang="en">
Expand Down Expand Up @@ -70,7 +77,7 @@ const friends = [
{
friends.map(({ friend, img, url }) => (
<a href={url} target="_blank">
<img alt={`${friend}'s 88x31'`} class="rounded-sm" src={img} />
<img alt={`${friend}'s 88x31`} class="rounded-sm" src={img} />
</a>
))
}
Expand Down
2 changes: 1 addition & 1 deletion src/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ article.markdown {
@apply prose-a:text-rose-200 prose-a:underline hover:prose-a:text-fuchsia-400;

/* <blockquote> elements */
@apply prose-blockquote:border-l-4 prose-blockquote:border-gray-600;
@apply prose-blockquote:border-l-4 prose-blockquote:border-gray-600 prose-blockquote:not-italic;

/* <li> elements */
@apply prose-li:leading-7 prose-li:text-zinc-200;
Expand Down

0 comments on commit 164a0f3

Please sign in to comment.