Merge pull request #52 from rezaageng/style/change-font

Style/change font
rezaageng · Feb 28, 2024 · 37c15f3 · 37c15f3
2 parents 44dbef0 + 503b8ab
commit 37c15f3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "@types/uuid": "^9.0.2",
     "date-fns": "^2.30.0",
     "framer-motion": "^10.16.5",
+    "geist": "^1.2.2",
     "highlight.js": "^11.9.0",
     "lottie-react": "^2.4.0",
     "next": "14.1.0",
@@ -43,7 +44,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.45.2",
-    "react-icons": "^4.11.0",
+    "react-icons": "^5.0.1",
     "react-merge-refs": "^2.0.2",
     "react-responsive": "^9.0.2",
     "rehype-autolink-headings": "^7.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,4 +1,4 @@
-import { Poppins } from 'next/font/google'
+import { GeistSans } from 'geist/font/sans'
 import localFont from 'next/font/local'
 import Navbar from '@/components/navbar/Navbar'
 import './globals.css'
@@ -11,12 +11,6 @@ import LenisProvider from '@/libs/react-lenis'
 import Footer from '@/components/Footer'
 import Analytics from '@/components/Analytics'
 
-const poppins = Poppins({
-  weight: ['400', '500', '600', '700'],
-  subsets: ['latin'],
-  variable: '--font-poppins'
-})
-
 const hackNf = localFont({
   src: '../../public/assets/fonts/HackNerdFont-Regular.ttf',
   fallback: ['monospace'],
@@ -62,7 +56,7 @@ const RootLayout = ({
 }): React.ReactNode => {
   return (
     <LenisProvider root>
-      <html lang="en" className={`${poppins.variable} ${hackNf.variable}`}>
+      <html lang="en" className={`${GeistSans.variable} ${hackNf.variable}`}>
         <head />
         {process.env.NODE_ENV === 'production' ? <Analytics /> : null}
         <body className="overflow-x-hidden bg-primary font-sans text-white scrollbar-none">

diff --git a/src/components/contact/Contacts.tsx b/src/components/contact/Contacts.tsx
@@ -1,11 +1,6 @@
 import { type Social, type ContactsProps } from '@/@types'
-import {
-  FiGithub,
-  FiInstagram,
-  FiLinkedin,
-  FiMail,
-  FiTwitter
-} from 'react-icons/fi'
+import { FiGithub, FiInstagram, FiLinkedin, FiMail } from 'react-icons/fi'
+import { RiTwitterXLine } from 'react-icons/ri'
 import { v4 as uuidv4 } from 'uuid'
 import ContactItem from './ContactItem'
 
@@ -21,7 +16,7 @@ const Contacts = ({
       link: link.gitHub
     },
     {
-      icon: <FiTwitter data-testid="contact-icon" size={iconSize} />,
+      icon: <RiTwitterXLine data-testid="contact-icon" size={iconSize} />,
       link: link.twitter
     },
     {

diff --git a/src/components/home/HomeThanks.tsx b/src/components/home/HomeThanks.tsx
@@ -68,7 +68,7 @@ const HomeThanks = ({ link }: Props): JSX.Element => {
       link: link.attributes.gitHub
     },
     {
-      name: 'Twitter',
+      name: 'X (Twitter)',
       link: link.attributes.twitter
     },
     {

diff --git a/src/components/terminal/TerminalContact.tsx b/src/components/terminal/TerminalContact.tsx
@@ -25,7 +25,7 @@ const TerminalContact = (): JSX.Element => {
       link: data.attributes.gitHub
     },
     {
-      name: 'Twitter',
+      name: 'X (Twitter)',
       link: data.attributes.twitter
     },
     {

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -21,7 +21,7 @@ module.exports = {
         }
       },
       fontFamily: {
-        sans: ['var(--font-poppins)'],
+        sans: ['var(--font-geist-sans)'],
         mono: ['var(--font-hacknf)']
       },
       gridTemplateColumns: {