Skip to content

# 🔄 PR: Upgrade TailwindCSS from v3 → v4 #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: prod
Choose a base branch
from
Open

# 🔄 PR: Upgrade TailwindCSS from v3 → v4 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42c34f6
fix
festus-sulumeti Oct 29, 2025
34ce115
feat:Sucessfully migrated from tailwind v3 to v4
festus-sulumeti Oct 29, 2025
7f45e47
Merge branch 'prod' into development
festus-sulumeti Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,051 changes: 1,127 additions & 924 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"@formspree/react": "^2.4.1",
"@playwright/test": "1.27.1",
"@tailwindcss/aspect-ratio": "^0.4.0",
"@tailwindcss/postcss": "^4.1.16",
"@types/react": "18.0.21",
"@typescript-eslint/eslint-plugin": "^5.38.1",
"autoprefixer": "10.4.7",
"concurrently": "^7.4.0",
"eslint": "8.17.0",
"eslint-config-next": "12.1.6",
"eslint-config-prettier": "^8.5.0",
"postcss": "8.4.14",
"pre-commit": "^1.2.2",
"prettier": "^2.7.1",
"tailwindcss": "3.1.2",
"tailwindcss": "^4.1.16",
"typescript": "^4.8.4"
}
}
3 changes: 1 addition & 2 deletions postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
'@tailwindcss/postcss': {},
},
};
2 changes: 1 addition & 1 deletion src/components/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ const Button: React.FC<ButtonProps> = ({ children, ...props }) => {
);
};

export default Button;
export default Button;
14 changes: 7 additions & 7 deletions src/components/ContactUs/DesktopVersion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ export default function DesktopVersion() {

return (
<>
<h1 className="hidden lg:block font-montserrat text-[32px] font-[900] w-fit mx-auto py-4">
<h1 className="hidden lg:block font-montserrat text-[32px] font-black w-fit mx-auto py-4">
Have an interesting idea we should discuss?
</h1>
<div className="max-w-[800px] mx-auto pt-[36px] pb-[46px] rounded-[10px]">
<form className="mx-auto w-3/4" onSubmit={handleSubmit}>
<label
htmlFor="name"
className="block mb-2 text-xs text-black font-dmSans"
className="block mb-2 text-xs text-black font-dm-sans"
>
Name
</label>
Expand All @@ -45,13 +45,13 @@ export default function DesktopVersion() {
type="text"
name="name"
placeholder={'Jane Doe'}
className="border border-[#CEEDF4] w-full rounded-lg px-4 py-3 mb-5 placeholder-[#7E7979] outline-none font-montserrat text-base"
className="border border-[#CEEDF4] w-full rounded-lg px-4 py-3 mb-5 placeholder-[#7E7979] outline-hidden font-montserrat text-base"
required
/>
<ValidationError prefix="Name" field="name" errors={state.errors} />
<label
htmlFor="email"
className="block mb-2 text-xs text-black font-dmSans"
className="block mb-2 text-xs text-black font-dm-sans"
>
Email
</label>
Expand All @@ -60,21 +60,21 @@ export default function DesktopVersion() {
type="email"
name="email"
placeholder={'you@example.com'}
className="border border-[#CEEDF4] w-full rounded-lg px-4 py-3 mb-5 outline-none placeholder-[#7E7979] font-montserrat text-base"
className="border border-[#CEEDF4] w-full rounded-lg px-4 py-3 mb-5 outline-hidden placeholder-[#7E7979] font-montserrat text-base"
required
/>
<ValidationError prefix="Email" field="email" errors={state.errors} />
<label
htmlFor="message"
className="block mb-2 text-xs text-black font-dmSans"
className="block mb-2 text-xs text-black font-dm-sans"
>
Message
</label>
<textarea
id="message"
name="message"
placeholder="Hello, I'm getting in touch ..."
className="border border-[#CEEDF4] w-full rounded-lg px-4 py-[22px] mb-9 h-[178px] resize-none outline-none placeholder-[#7E7979] font-montserrat text-base"
className="border border-[#CEEDF4] w-full rounded-lg px-4 py-[22px] mb-9 h-[178px] resize-none outline-hidden placeholder-[#7E7979] font-montserrat text-base"
required
/>

Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactUs/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Footer = () => {
<footer
id="contacts"
aria-label="React Devs KE Socials"
className="py-6 bg-[#03045e] border-t-[2px] border-[#c0c0d6]"
className="py-6 bg-[#03045e] border-t-2 border-[#c0c0d6]"
>
<div className="flex flex-col justify-center gap-9">
{/* Social media icons with links */}
Expand Down
8 changes: 4 additions & 4 deletions src/components/ContactUs/MobileVersion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function MobileVersion() {

return (
<>
<h1 className="text-black font-robotoMono text-4xl w-fit mx-auto py-4 font-bold">
<h1 className="text-black font-roboto-mono text-4xl w-fit mx-auto py-4 font-bold">
Let's talk React
</h1>
<form className="w-4/5 mx-auto md:w-2/3 bg-[#0096c7]" onSubmit={handleSubmit}>
Expand All @@ -44,7 +44,7 @@ export default function MobileVersion() {
type="text"
name="name"
placeholder="Name"
className=" placeholder-[#000] outline-none flex-grow ml-8 font-robotoMono text-base bg-[#0096c7]"
className=" placeholder-black outline-hidden grow ml-8 font-roboto-mono text-base bg-[#0096c7]"
required
/>
</label>
Expand All @@ -66,7 +66,7 @@ export default function MobileVersion() {
type="email"
placeholder="Email"
name="email"
className="inline-block ml-2 outline-none flex-grow placeholder-[#000] font-robotoMono text-base bg-[#0096c7]"
className="inline-block ml-2 outline-hidden grow placeholder-black font-roboto-mono text-base bg-[#0096c7]"
required
/>
</label>
Expand All @@ -82,7 +82,7 @@ export default function MobileVersion() {
<textarea
placeholder="Message"
name="message"
className=" inline-block ml-2 h-[270px] resize-none outline-none flex-grow placeholder-[#000] font-robotoMono text-base bg-[#0096c7]"
className=" inline-block ml-2 h-[270px] resize-none outline-hidden grow placeholder-black font-roboto-mono text-base bg-[#0096c7]"
required
></textarea>
</label>
Expand Down
4 changes: 1 addition & 3 deletions src/components/HeroHeader/DesktopHero.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ export default function HeroHeader() {
className="relative bg-cover bg-center bg-no-repeat"
style={{
backgroundImage: `url('/images/hero-image.jpg')`,
backgroundColor: '#160c0c',

}}
>

<div className="w-full flex py-20 flex-col items-center justify-center z-10 bg-black bg-opacity-80">
<h1 className="font-montserrat font-bold text-center text-white text-[40px] leading-10 w-[388px] mx-auto mt-24">
React Developer Community Kenya
</h1>
<p className="font-montserrat text-white w-[570px] mx-auto text-center mt-5 mb-[45px]">
<p className="font-montserrat text-white max-w-[570px] mt-5 mb-[45px]">
We are a tech community in Kenya focused on the React JS library and its ecosystem.
</p>
<div className="flex items-center justify-center relative">
Expand Down
2 changes: 1 addition & 1 deletion src/components/LinkButton/LinkButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type LinkButtonProps = React.ComponentProps<'a'>;
const LinkButton: React.FC<LinkButtonProps> = ({ children, ...props }) => {
return (
<a
className="p-4 px-8 text-white font-bold bg-red-600 rounded block w-[200px] overflow-hidden whitespace-nowrap overflow-ellipsis text-center"
className="p-4 px-8 text-white font-bold bg-red-600 rounded-sm block w-[200px] overflow-hidden whitespace-nowrap text-ellipsis text-center"
{...props}
>
{children}
Expand Down
38 changes: 33 additions & 5 deletions src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,41 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';

@plugin '@tailwindcss/aspect-ratio';

@theme {
--animate-spin: spin 10s linear infinite;

/* Fonts */
--font-montserrat: Montserrat, sans-serif;
--font-roboto-mono: Roboto Mono, monospace;
--font-dm-sans: DM Sans, sans-serif;

/* Colors */
--color-white: oklch(1 0 0); /* pure white */
--color-black: oklch(0 0 0);
--color-red-600: oklch(0.63 0.26 25);
--color-red-700: oklch(0.55 0.25 25);
--color-gray-200: oklch(0.92 0 0);
}

/* Compatibility Layer for Tailwind v3 border defaults */
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
}

html,
body {
padding: 0;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-family: var(--font-dm-sans);
background-color: var(--color-black);
color: var(--color-white);
}

a {
Expand Down
20 changes: 0 additions & 20 deletions tailwind.config.js
View file
Open in desktop

This file was deleted.