Skip to content

refactor: Synchronize FreeCodeCamp CSS Styling #604

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
NewtonLC wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: Synchronize FreeCodeCamp CSS Styling #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff95805
Updated React Dependency Versions
NewtonLC Apr 28, 2026
b6c3a3f
style: align globals.css with main freeCodeCamp platform
NewtonLC Jun 13, 2026
7044014
style: align tailwind color tokens with main freeCodeCamp platform
NewtonLC Jun 13, 2026
4b50b6b
Merge branch 'freeCodeCamp:main' into feat/css-fcc-alignment
NewtonLC Jun 14, 2026
761e107
Synchronized Classroom CSS with FCC Proper
NewtonLC Jun 15, 2026
3c21a1e
Updated Test and Snapshots
NewtonLC Jun 16, 2026
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 changes: 1 addition & 1 deletion __tests__/components/__snapshots__/error.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`ErrorComponet displays error cause and error message properly 1`] = `
className="h-[38px]"
>
<div
className="h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1"
className="h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1 text-[18px]"
>
<div
className="hidden lg:flex block flex-1 justify-end"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/components/__snapshots__/modal.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`Modal Component renders header correctly 1`] = `
className="flex justify-center"
>
<div
className="flex cursor-pointer justify-center p-4 m-6 rounded-md hover:bg-fcc-primary-yellow shadedow-lg border-solid border-color: inherit; border-2 pl-4 pr-4 bg-[#feac32] text-black"
className="flex cursor-pointer justify-center p-4 m-6 rounded-md shadow-lg border-solid border-[3px] border-[#feac32] bg-gradient-to-b from-[#fecc4c] to-[#ffac33] text-black text-[1.1rem] font-semibold hover:from-[#fecc4c] hover:to-[#fecc4c] hover:border-[#f1a02a]"
onClick={[Function]}
>
Create Class
Expand All @@ -31,7 +31,7 @@ exports[`Modal Component renders whole form after header clicked 1`] = `
className="flex justify-center"
>
<div
className="flex cursor-pointer justify-center p-4 m-6 rounded-md hover:bg-fcc-primary-yellow shadedow-lg border-solid border-color: inherit; border-2 pl-4 pr-4 bg-[#feac32] text-black"
className="flex cursor-pointer justify-center p-4 m-6 rounded-md shadow-lg border-solid border-[3px] border-[#feac32] bg-gradient-to-b from-[#fecc4c] to-[#ffac33] text-black text-[1.1rem] font-semibold hover:from-[#fecc4c] hover:to-[#fecc4c] hover:border-[#f1a02a]"
onClick={[Function]}
>
Create Class
Expand Down
2 changes: 1 addition & 1 deletion __tests__/components/__snapshots__/navbar.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Navbar rendering correctly renders correctly 1`] = `
className="h-[38px]"
>
<div
className="h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1"
className="h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1 text-[18px]"
>
<div
className="hidden lg:flex block flex-1 justify-end"
Expand Down
2 changes: 1 addition & 1 deletion __tests__/components/modal.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const sampleData = [

const sampleUser = 'Ayomide';
const className =
'flex cursor-pointer justify-center p-4 m-6 rounded-md hover:bg-fcc-primary-yellow shadedow-lg border-solid border-color: inherit; border-2 pl-4 pr-4 bg-[#feac32] text-black';
'flex cursor-pointer justify-center p-4 m-6 rounded-md shadow-lg border-solid border-[3px] border-[#feac32] bg-gradient-to-b from-[#fecc4c] to-[#ffac33] text-black text-[1.1rem] font-semibold hover:from-[#fecc4c] hover:to-[#fecc4c] hover:border-[#f1a02a]';

describe('Modal Component', () => {
it('renders header correctly', () => {
Expand Down
2 changes: 1 addition & 1 deletion components/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default function Modal({
</div>
<div className='flex justify-center'>
<div
className='flex cursor-pointer justify-center p-4 m-6 rounded-md hover:bg-fcc-primary-yellow shadedow-lg border-solid border-color: inherit; border-2 pl-4 pr-4 bg-[#feac32] text-black'
className='flex cursor-pointer justify-center p-4 m-6 rounded-md shadow-lg border-solid border-[3px] border-[#feac32] bg-gradient-to-b from-[#fecc4c] to-[#ffac33] text-black text-[1.1rem] font-semibold hover:from-[#fecc4c] hover:to-[#fecc4c] hover:border-[#f1a02a]'
onClick={clicked}
>
Create Class
Expand Down
2 changes: 1 addition & 1 deletion components/navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import AuthButton from '../components/authButton';
export default function Navbar({ children }) {
return (
<div className='h-[38px]'>
<div className='h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1'>
<div className='h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1 text-[18px]'>
<div className='hidden lg:flex block flex-1 justify-end'></div>
<Link href='/classes' className='flex items-center'>
<Image
Expand Down
4 changes: 2 additions & 2 deletions pages/admin/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ export default function Home(props) {
<link rel='icon' href='/favicon.ico' />
</Head>
<Navbar>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/classes'}>Classes</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/'}> Menu</Link>
</div>
</Navbar>
Expand Down
4 changes: 2 additions & 2 deletions pages/classes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ export default function Classes({
{userSession && (
<>
<Navbar>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/classes'}>Classes</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/'}> Menu</Link>
</div>
</Navbar>
Expand Down
4 changes: 2 additions & 2 deletions pages/dashboard/[id].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ export default function Home({
{userSession && (
<>
<Navbar>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/classes'}>Classes</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/'}> Menu</Link>
</div>
</Navbar>
Expand Down
4 changes: 2 additions & 2 deletions pages/dashboard/v2/[id].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ export default function Home({
{userSession && (
<>
<Navbar>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/classes'}>Classes</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/'}> Menu</Link>
</div>
</Navbar>
Expand Down
6 changes: 3 additions & 3 deletions pages/dashboard/v2/details/[id]/[studentEmail].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ export default function StudentDetails({
{userSession && (
<>
<Navbar>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={`/dashboard/v2/${classroomID}`}>&lt;</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/classes'}>Classes</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/'}> Menu</Link>
</div>
</Navbar>
Expand Down
10 changes: 5 additions & 5 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ export default function Home() {
<link rel='icon' href='/favicon.ico' />
</Head>
<Navbar>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/classes'}>Classes</Link>
</div>
<div className='border-solid border-2 pl-4 pr-4'>
<div className='navButton'>
<Link href={'/'}> Menu</Link>
</div>
</Navbar>
<div className={styles.boxx}>
<h1 className='text-[40px] text-center big-heading underline'>
<h1 className='text-2xl md:text-[40px] text-center big-heading underline'>
Welcome to FreeCodeCamp Classroom Mode
</h1>
</div>
<div className={'p-6 ml-20 mr-20'}>
<div className={'p-6 mx-3 md:mx-20'}>
<h1
className={
'box-content bg-fcc-gray-15 h-100 w-100 p-4 border-4 border-fcc-gray-90 text-3xl'
'box-content bg-fcc-gray-15 h-100 w-100 p-4 border-4 border-fcc-gray-90 text-lg md:text-3xl'
}
>
A self-hosted solution to help teachers plan and manage
Expand Down
1 change: 1 addition & 0 deletions styles/Home.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,5 @@
display: flex;
align-items: center;
justify-content: center;
margin-top: 2rem;
}
32 changes: 9 additions & 23 deletions styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,16 @@
@tailwind utilities;

:root {
/* Colors */
/* Light Gray */
--fcc-gray-00: #ffffff;
--fcc-gray-05: #f5f6f7;
--fcc-gray-10: #dfdfe2;
--fcc-gray-15: #d0d0d5;
/* Dark Gray */
--fcc-gray-80: #2a2a40;
--fcc-gray-75: #3b3b4f;
--fcc-gray-85: #1b1b32;
--fcc-gray-90: #0a0a23;

/* Primary Colors */
--fcc-primary-purple: #dbb8ff;
--fcc-primary-yellow: #f1be32;
--fcc-primary-blue: #99c9ff;
--fcc-primary-lightGreen: #acd157;

/* Secondary Colors */
--fcc-secondary-darkPurple: #5a01a7;
--fcc-secondary-darkYellow: #4d3800;
--fcc-secondary-darkBlue: #002ead;
--fcc-secondary-darkGreen: #00471b;
}

html,
body {
padding: 0;
margin: 0;
font-family: 'Roboto Mono', monospace;
font-family: 'Lato', sans-serif;
font-size: clamp(18px, 1.5vw, 21.0625px);
}

a {
Expand All @@ -44,9 +24,15 @@ a {
box-sizing: border-box;
}

.navButton {
border: 1px solid;
padding-left: 1rem;
padding-right: 1rem;
}

.toast-message {
background: var(--fcc-gray-90);
color: var(--fcc-gray-00);
font-size: 20px;
--toastify-font-family: 'Roboto Mono', monospace;
--toastify-font-family: 'Lato', sans-serif;
}
13 changes: 12 additions & 1 deletion tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module.exports = {
0o5: '#f5f6f7',
10: '#dfdfe2',
15: '#d0d0d5',
45: '#858591',
// DARK GRAYs
75: '#3b3b4f',
80: '#2a2a40',
Expand All @@ -38,7 +39,7 @@ module.exports = {

primary: {
purple: '#dbb8ff',
yellow: '#f1be32',
yellow: '#ffbf00',
blue: '#99c9ff',
lightGreen: '#acd157'
},
Expand All @@ -48,6 +49,16 @@ module.exports = {
darkYellow: '#4d3800',
darkBlue: '#002ead',
darkGreen: '#00471b'
},

mid: {
blue: '#198eee',
purple: '#9400d3'
},

red: {
light: '#ffadad',
dark: '#850000'
}
},
...colors
Expand Down