Skip to content

Commit

Permalink
style: revert inner scrollbar change & operate btns relative
Browse files Browse the repository at this point in the history
  • Loading branch information
lcomplete committed Apr 3, 2023
1 parent 58d934b commit 639ba33
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions app/client/src/components/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ const Layout = () => {
/>
<div className="h-full layoutRoot">
<Header />
<div className="main_window flex flex-row h-full">
<div className="main_window flex flex-row">
<div className="main_sidebar">
<Sidebar/>
</div>
<div className="flex-auto h-full">
<div className="flex-auto">
<Outlet/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/MainContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react";

const MainContainer = (props) =>{
return (
<div className="flex-auto h-full overflow-y-auto">
<div className="flex-auto">
{props.children}
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/components/PageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ const PageList = (props: PageListProps) => {
}
</div>
</div>
<div className={'w-[270px] sticky mt-3 top-20 self-start'}>
<div className={'w-[270px] sticky mt-3 top-28 self-start'}>
{props.filterComponent}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/client/src/components/PageOperationButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ const PageOperationButtons = ({
}

function groupSaveAction(mainIcon, mainAction, mainTooltip, secondaryIcon, secondaryAction, secondaryTooltip) {
return <div className={"float-right group"}>
return <div className={"float-right group relative"}>
<Tooltip title={mainTooltip} placement={"right"}>
<IconButton onClick={mainAction} className={"group-hover:shadow-heavy group-hover:bg-white"}>
{mainIcon}
</IconButton>
</Tooltip>
<div className={"group-hover:flex hidden absolute flex-col"}>
<div className={"group-hover:flex hidden absolute flex-col z-40"}>
<Tooltip title={secondaryTooltip} placement={"right"}>
<IconButton onClick={secondaryAction} className={"mt-2 bg-white shadow-heavy hover:bg-white"}>
{secondaryIcon}
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ a{
background-color: rgba(255, 255, 255, 0.85);
backdrop-filter: blur(8px);
z-index: 100;
@apply sticky top-0;
@apply sticky top-12;
}

.separator {
Expand Down

0 comments on commit 639ba33

Please sign in to comment.