Skip to content
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

Jump to bottom

Login page colour difference on dark mode fixed #58

Closed
wants to merge 4 commits into from
Closed

Login page colour difference on dark mode fixed #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
038e362
Fixed: login page colour difference on dark mode
joriordan332 Oct 19, 2024
d60efa0
Removed button within button
joriordan332 Oct 19, 2024
5348f76
Removed login.css import
joriordan332 Oct 19, 2024
9d48392
Fixed: dark/light
joriordan332 Oct 19, 2024
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
9 changes: 0 additions & 9 deletions src/views/Login.css
View file
Open in desktop

This file was deleted.

59 changes: 30 additions & 29 deletions src/views/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useNavigate } from 'react-router-dom';
import { Button } from '@/components/ui/button';
import { Eclipse, Sun } from 'lucide-react';
import { Context } from '../Context';
import './Login.css';

function Login() {
const { darkMode, setDarkMode } = useContext(Context);
Expand All @@ -22,37 +21,39 @@ function Login() {
};

return (
<div
className={`${darkMode && 'dark'} flex justify-center items-center h-screen`}
>
<div className="bg-transparent text-white w-11/12 max-w-lg p-8 ">
<div className="flex justify-center items-center mb-6">
{darkMode ? (
<img src="grocerease-light.png" alt="Shopping app logo" />
) : (
<img src="grocerease.png" alt="Shopping app logo" />
)}
</div>
<div className="flex justify-center items-center h-2/5">
<div className="flex justify-center items-center bg-pink-500 hover:bg-pink-500 hover:bg-opacity-80 w-2/4 h-1/4 rounded-xl p-2">
<button type="button" onClick={signIn}>
Sign In
</button>
<div className={`${darkMode && 'dark'} min-h-screen`}>
<div className="flex justify-center items-center h-screen dark:text-white bg-white dark:bg-black">
<div className="bg-transparent text-white w-11/12 max-w-lg p-8 ">
<div className="flex justify-center items-center mb-6">
{darkMode ? (
<img src="grocerease-light.png" alt="Shopping app logo" />
) : (
<img src="grocerease.png" alt="Shopping app logo" />
)}
</div>
<div className="flex justify-center items-center h-2/5">
<div className="flex justify-center items-center bg-pink-500 hover:bg-pink-500 hover:bg-opacity-80 w-2/4 h-1/4 rounded-xl p-2">
<button type="button" onClick={signIn}>
Sign In
</button>
</div>
</div>
</div>
</div>
<Button
onClick={toggleDarkMode}
className="fixed w-16 bottom-16 right-16 p-2 rounded-full text-primary-pink hover:text-primary-pink hover:text-opacity-60 font-semibold"
>
<abbr title={darkMode ? 'Switch to light mode' : 'Switch to dark mode'}>
<button
className={`${darkMode && 'dark'} rounded-full text-primary-pink hover:text-opacity-60`}
<Button
onClick={toggleDarkMode}
className="fixed w-16 bottom-16 right-16 p-2 rounded-full text-primary-pink hover:text-primary-pink hover:text-opacity-60 font-semibold"
>
<abbr
title={darkMode ? 'Switch to light mode' : 'Switch to dark mode'}
>
{darkMode ? <Eclipse /> : <Sun />}
</button>
</abbr>
</Button>
{darkMode ? (
<Eclipse className="w-8 h-8" />
) : (
<Sun className="w-8 h-8" />
)}
</abbr>
</Button>
</div>
</div>
);
}
Expand Down