Skip to content

Fix issue #766 | Multiple scrollbars fix and hover effect for collapsible navbar buttons #775

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

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Fix issue #766 | Multiple scrollbars fix and hover effect for collapsible navbar buttons #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e476e9f
fix: remove unnecessary overflow scroll from layout components
StDensity Jan 13, 2025
501f530
fix: adjust layout height and update overflow behavior for better scr…
StDensity Jan 13, 2025
8f163ed
fix: add cursor pointer to toggle button for better user interaction
StDensity Jan 13, 2025
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
6 changes: 3 additions & 3 deletions docs/app/docs/layout.tsx
View file
Open in desktop
Copy link
Collaborator

@kotAPI kotAPI Jan 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to redo the layout without using the h-[94vh] class

Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ const InfoIcon = () => {

const Layout = ({ children }: any) => {
return (
<div data-accent-color="blue" className="flex space-x-2 w-full h-screen overflow-hidden">
<div data-accent-color="blue" className="flex space-x-2 w-full h-[94vh] overflow-hidden">
<div className='flex-none h-full flex flex-col'>
<Navigation />
</div>
<div className='lg:px-4 text-gray-1000 flex-1 flex flex-col gap-4 overflow-scroll pt-2' id="docs-content">
<div className='lg:px-4 text-gray-1000 flex-1 flex flex-col gap-4 overflow-y-scroll pt-2' id="docs-content">
<Callout color="green">
<div className='flex-none'>
<InfoIcon />
Expand All @@ -31,4 +31,4 @@ const Layout = ({ children }: any) => {
);
};

export default Layout;
export default Layout;
4 changes: 2 additions & 2 deletions docs/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import TrafficAnalyticsDemo from './landingComponents/TrafficAnalyticsDemo'

export default function Home() {
return (
<div className='h-screen overflow-scroll'>
<div className='h-screen '>
<LandingBgPattern />
<div className='lg:p-10 flex flex-col overflow-scroll'>
<div className='lg:p-10 flex flex-col'>
<HeroSection />
{/* */}
<div className='text-gray-1000 p-10 mt-10 flex space-x-4 w-full overflow-x-auto relative z-10'>
Expand Down
4 changes: 2 additions & 2 deletions docs/components/Main/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ const MainLayout = ({ darkModeSsrValue, children }) => {

return (
<Theme isDark={darkMode} >
<div className={`h-screen overflow-hidden flex flex-col ${darkMode ? 'rad-ui-dark-theme bg-black' : 'bg-gray-50'}`} data-accent-color="red">
<div className={`flex flex-col ${darkMode ? 'rad-ui-dark-theme bg-black' : 'bg-gray-50'}`} data-accent-color="red">
{/* Navbar start */}
<NavBar cookies={cookies} darkMode={darkMode} setDarkMode={setDarkMode} setCookie={setCookie} />
{/* Navbar end */}
<div className='h-screen overflow-scroll'>
<div >
{children}
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions docs/components/navigation/Navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ const sections = [


const HamburgerIcon = (props) => (
<svg xmlns="http://www.w3.org/2000/svg" width={24} height={24} {...props}>
<svg xmlns="http://www.w3.org/2000/svg" width={24} height={24} {...props} >
<g>
<path
strokeLinecap="round"
Expand Down Expand Up @@ -247,8 +247,8 @@ const Navigation = () => {
}


return <div className=' relative border-box px-1 overflow-y-auto lg:block flex flex-col pb-[200px] min-w-[40px] min-h-[40px]'>
<div onClick={toggleCollapse} className={`absolute right-2 top-3` }>{isCollapsed? <HamburgerIcon /> : <XIcon />}</div>
return <div className=' relative border-box px-1 overflow-y-scroll lg:block flex flex-col pb-[200px] min-w-[40px] min-h-[40px]'>
<div onClick={toggleCollapse} className={`absolute right-2 top-3 cursor-pointer` }>{isCollapsed? <HamburgerIcon /> : <XIcon />}</div>
<div className={`${isCollapsed ? "hidden" : "block"}`}>
<div className='flex-none' style={{ width: "240px" }}>
{sections.map((section, i) => {
Expand Down
Loading