Skip to content

Commit 7efe9f0

Browse files
authored
Merge pull request #216 from wwWallet/update-style-nav-sidebar
UI Enhancements for Sidebar and Navigation
2 parents 71831f0 + 6963020 commit 7efe9f0

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/components/BottomNav.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ const BottomNav = ({ isOpen, toggle }) => {
2727
};
2828

2929
return (
30-
<div className={`fixed bottom-0 left-0 right-0 bg-white flex justify-around p-4 z-50 max480:flex hidden shadow-2xl rounded-t-lg`}>
30+
<div className={`fixed bottom-0 left-0 right-0 bg-white flex justify-around p-4 z-40 max480:flex hidden shadow-2xl rounded-t-lg`}>
3131
{navItems.map(item => (
3232
<div
3333
key={item.path}
34-
className={`cursor-pointer flex flex-col items-center w-[20%] ${(location.pathname === item.path && !isOpen) ? 'text-custom-blue' : 'text-gray-400'} hover:text-custom-blue transition-colors duration-200`}
34+
className={`cursor-pointer flex flex-col items-center w-[20%] ${(location.pathname === item.path && !isOpen) ? 'text-custom-blue' : 'text-gray-400'} transition-colors duration-200`}
3535
onClick={() => handleNavigate(item.path)}
3636
title={item.label}
3737
>
@@ -41,7 +41,7 @@ const BottomNav = ({ isOpen, toggle }) => {
4141
))}
4242
<div
4343
key={t("common.navItemProfile")}
44-
className={`cursor-pointer flex flex-col items-center w-[20%] ${(isOpen) ? 'text-custom-blue' : 'text-gray-400'} hover:text-custom-blue transition-colors duration-200`}
44+
className={`cursor-pointer flex flex-col items-center w-[20%] ${(isOpen) ? 'text-custom-blue' : 'text-gray-400'} transition-colors duration-200`}
4545
onClick={toggle}
4646
title={t("common.navItemProfile")}
4747
>

src/components/Sidebar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const NavItem = ({
1818
return (
1919
<li
2020
onClick={() => handleNavigate(path)}
21-
className={`cursor-pointer flex items-center space-x-2 mb-4 p-2 rounded-r-xl ${location.pathname === path ? 'bg-white text-custom-blue' : 'nav-item-animate-hover'}`}
21+
className={`cursor-pointer flex items-center space-x-2 mb-4 p-2 rounded-r-xl ${location.pathname === path ? 'min481:bg-white min481:text-custom-blue' : 'nav-item-animate-hover'}`}
2222
>
2323
{children}
2424
</li>
@@ -54,7 +54,7 @@ const Sidebar = ({ isOpen, toggle }) => {
5454
return (
5555
<div
5656
className={`${isOpen
57-
? 'w-full flex flex-col justify-between fixed h-screen z-50 bg-custom-blue text-white p-4 pb-16 overflow-y-auto'
57+
? 'w-full flex flex-col justify-between fixed h-screen z-30 bg-custom-blue text-white p-4 max480:pb-20 overflow-y-auto'
5858
: 'hidden sm:flex sm:flex-col justify-between sticky top-0 bg-custom-blue w-auto text-white h-screen py-10 px-10 overflow-y-auto'
5959
6060
}`}
@@ -143,7 +143,7 @@ const Sidebar = ({ isOpen, toggle }) => {
143143
</div>
144144

145145
{/* Powered By */}
146-
<div className="bg-custom-blue text-white text-sm space-x-2 mb-4 p-2 table-footer-group">
146+
<div className="bg-custom-blue text-white text-sm space-x-2 p-2">
147147
<Trans
148148
i18nKey="sidebar.poweredBy"
149149
components={{

tailwind.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module.exports = {
1717
},
1818
screens: {
1919
'max480': { 'max': '480px' },
20+
'min481': { 'min': '481px' },
2021
}
2122
},
2223
},

0 commit comments

Comments
 (0)