Skip to content
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

Jump to bottom

Ensure only bordering areas of app are draggable #82

Merged
merged 3 commits into from
May 7, 2024
Merged

Ensure only bordering areas of app are draggable #82

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5db925
fix: Ensure only bordering areas are draggable
May 3, 2024
0db7235
fix: Ensure left border is always draggable
May 7, 2024
83e225e
Merge branch 'trunk' into fix/tweak-draggable-regions
May 7, 2024
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
2 changes: 1 addition & 1 deletion src/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function App() {
scrollbarGutter: 'stable',
} }
data-testid="site-content"
className="p-8 bg-white overflow-y-auto h-full flex-grow rounded-chrome"
className="py-8 pr-8 bg-white overflow-y-auto h-full flex-grow rounded-chrome"
>
<SiteContentTabs />
</main>
Expand Down
7 changes: 6 additions & 1 deletion src/components/main-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,12 @@ export default function MainSidebar( { className }: MainSidebarProps ) {
>
<SidebarToolbar />
<div className="flex flex-col h-full">
<div className="flex-1 overflow-y-auto sites-scrollbar">
<div
className={ cx(
'flex-1 overflow-y-auto sites-scrollbar app-no-drag-region',
isMac() ? 'ml-5' : 'ml-4'
) }
>
<SiteMenu />
</div>
<div className="flex flex-col gap-4 pt-5 border-white border-t border-opacity-10 app-no-drag-region">
Expand Down
2 changes: 1 addition & 1 deletion src/components/site-content-tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function SiteContentTabs() {
}

return (
<div className="flex flex-col w-full h-full app-no-drag-region">
<div className="flex flex-col w-full h-full pl-8 app-no-drag-region">
<Header />
<TabPanel className="mt-6 h-full flex flex-col" tabs={ tabs } orientation="horizontal">
{ ( { name } ) => (
Expand Down
4 changes: 2 additions & 2 deletions src/components/site-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function SiteItem( { site }: { site: SiteDetails } ) {
<li
className={ cx(
'flex flex-row min-w-[168px] h-8 hover:bg-[#ffffff0C] focus:bg-[#ffffff0C] rounded transition-all',
isMac() ? 'mx-5' : 'mx-4',
isMac() ? 'mr-5' : 'mr-4',
isSelected && 'bg-[#ffffff19] hover:bg-[#ffffff19] focus:bg-[#ffffff19]'
) }
>
Expand All @@ -127,7 +127,7 @@ export default function SiteMenu( { className }: SiteMenuProps ) {
scrollbarGutter: 'stable',
} }
className={ cx(
'w-full overflow-y-auto overflow-x-hidden flex flex-col gap-0.5 pb-4 app-no-drag-region',
'w-full overflow-y-auto overflow-x-hidden flex flex-col gap-0.5 pb-4',
className
) }
>
Expand Down
Loading