Fix merge conflicts

auguwu · auguwu · commit 164a0f361713 · 2024-08-11T15:22:40.000-07:00
diff --git a/astro.config.ts b/astro.config.ts
@@ -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';
@@ -34,7 +35,7 @@ export default defineConfig({
     output: 'server',
     site: 'https://floofy.dev',
     markdown: {
-        remarkPlugins: [twemoji],
+        remarkPlugins: [twemoji, githubAlerts],
         syntaxHighlight: 'shiki',
         shikiConfig: {
             theme: 'poimandres',
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -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"
diff --git a/src/content/blog/bun.md b/src/content/blog/bun.md
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -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',
@@ -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">
@@ -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>
                     ))
                 }
diff --git a/src/styles/global.css b/src/styles/global.css
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ const projects: Props['data'][] = [`
`22`	`22`	`}`
`23`	`23`	`];`
`24`	`24`
	`25`	`+// if any mutuals I know want to be added, you can DM me on Discord (@auguwu)`
	`26`	`+// or submit a PR if you wish :3`
`25`	`27`	`const friends = [`
`26`	`28`	`{`
`27`	`29`	`friend: 'Spotlight',`
`@@ -32,8 +34,13 @@ const friends = [`
`32`	`34`	`friend: 'Alula',`
`33`	`35`	`img: 'https://alula.me/webring/alula.png',`
`34`	`36`	`url: 'https://alula.me'`
	`37`	`+ },`
	`38`	`+ {`
	`39`	`+ friend: 'Ovyerus',`
	`40`	`+ img: 'https://ovyerus.com/webring/ovyerus.png',`
	`41`	`+ url: 'https://ovyerus.com'`
`35`	`42`	`}`
`36`		`-];`
	`43`	`+] as const;`
`37`	`44`	`---`
`38`	`45`
`39`	`46`	`<html lang="en">`
`@@ -70,7 +77,7 @@ const friends = [`
`70`	`77`	`{`
`71`	`78`	`friends.map(({ friend, img, url }) => (`
`72`	`79`	`<a href={url} target="_blank">`
`73`		- <img alt={`${friend}'s 88x31'`} class="rounded-sm" src={img} />
	`80`	+ <img alt={`${friend}'s 88x31`} class="rounded-sm" src={img} />
`74`	`81`	`</a>`
`75`	`82`	`))`
`76`	`83`	`}`