Skip to content

Commit

Permalink
Resolve Conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mansi066 committed Jan 3, 2025
1 parent 9e58757 commit 1568f7a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/Pages/PremiumBeans.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const PremiumContainer = styled.div`
max-width: 1200px;
margin: 0 auto;
background-color: #fffbeb;
box-shadow: 1px 1px 5px 6px #888888;
`;

const FeatureTitle = styled(motion.h1)`
Expand Down
5 changes: 5 additions & 0 deletions src/componets/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,11 @@ function Navbar() {
whileHover={{ scale: 1.05 }}>
<Link to="/testimonial">Testimonial</Link>
</NavLink>
{/* <!-- ------NavLink::::Premium Beans-------------------> */}
<NavLink className={location.pathname === '/premiumbeans' ? 'active' : ''}
whileHover={{ scale: 1.05 }}>
<Link to="/premiumbeans">Premium Beans</Link>
</NavLink>

{/* <!-- ------NavLink:::::Contacts-------------------> */}
<NavLink className={location.pathname === '/contact' ? 'active' : ''}
Expand Down

0 comments on commit 1568f7a

Please sign in to comment.