Skip to content

Commit

Permalink
Resolve merge
Browse files Browse the repository at this point in the history
  • Loading branch information
xsymmetry9 committed Dec 14, 2024
2 parents 992f4d6 + d8f8f26 commit 1253a29
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions packages/frontend/src/components/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const Login = () => {
onChange={(e) => setEmail(e.target.value)}
/>
</div>
<div className='container w-[228px] mx-auto'>
<div className='mt-[1rem] relative'>
<label htmlFor="password" className="text-base text-letter-grey font-inter">Password</label>
<input
className="mt px-2 py-1 w-[228px] h-[24px] border rounded text-sm"
Expand All @@ -69,9 +69,7 @@ const Login = () => {
onChange={(e) => setPassword(e.target.value)}
/>
</div>
<div className="w-[228px] mx-auto mt-[12px]">
<button className="bg-font-montserrat text-black-text font-semibold border border-yellow-cta rounded-[5px] w-[240px] h-[33px] bg-yellow-cta" type="submit">Login</button>
</div>
<button className="bg-font-montserrat text-black-text font-semibold border border-yellow-cta rounded-[5px] mt-[3rem] px-[97px] py-[7px] my-5 bg-yellow-cta" type="submit">Login</button>


</form>
Expand Down

0 comments on commit 1253a29

Please sign in to comment.