Skip to content

Commit

Permalink
Merge pull request #6 from Jay9874/main
Browse files Browse the repository at this point in the history
Add color exp and bug fix
  • Loading branch information
Jay9874 authored Nov 11, 2023
2 parents 008dc40 + 7991a32 commit 36a518e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
12 changes: 8 additions & 4 deletions client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
--gogle-yellow-fade-25: #fbbc0440;
--gogle-yellow-fade-50: #fbbc0461;
--gogle-blue: #4285f4;
--new-blue: #3c82f6;
--gogle-blue-fade-25: #4285f440;
}

Expand Down Expand Up @@ -166,7 +167,8 @@ a {
position: relative;
border-radius: 1.5px;
width: 18px;
background-color: var(--body-main-bg);
/* background-color: var(--body-main-bg); */
background-color: #ffffff;
transition: transform 1s cubic-bezier(0.86, 0, 0.07, 1), transform-origin 1s cubic-bezier(0.86, 0, 0.07, 1)
}

Expand Down Expand Up @@ -263,9 +265,10 @@ a {

.Navbar-signin-button {
padding: .5rem 1rem;
background-color: #4A90F4;
background-color: var(--new-blue);
border-radius: 24px;
color: #ffffff;
font-weight: bold;
white-space: nowrap;
}

Expand Down Expand Up @@ -547,10 +550,11 @@ a {
align-items: center;
justify-content: center;
border-radius: 20px;
border: 1px solid var(--body-main-bg);
/* border: 1px solid var(--body-main-bg); */
height: 40px;
min-width: 40px;
background-color: var(--body-main-bg-25);
/* background-color: var(--body-main-bg-25); */
background-color: var(--new-blue);
}

.event-card {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Navbar = () => {
Sign in
</Link>
) : !verifyLoading && verifySuccess ? (
<div className='w-[40px] h-[40px] rounded-full border border-[#FFBC39] bg-white overflow-hidden'>
<div className='w-[40px] h-[40px] rounded-full border border-[#3c82f6] bg-white overflow-hidden'>
<img
src={user?.avatar?.url ? user.avatar.url : '/user.svg'}
className='w-full h-full object-contain'
Expand Down

0 comments on commit 36a518e

Please sign in to comment.