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

Fix double scrollbars #450

Merged
merged 1 commit into from
Apr 27, 2022
Merged

Fix double scrollbars #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions assets/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@
.table-col-m {
width: 20rem;
}

html {
background-color: rgb(243 244 246);
}
35 changes: 22 additions & 13 deletions assets/js/components/Layout/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ const Layout = () => {

return (
<>
<main className="bg-gray-100 dark:bg-gray-800 h-screen overflow-hidden relative">
<main className="bg-gray-100 dark:bg-gray-800 relative">
<div className="flex items-start justify-between">
<div
className={classNames(
'h-screen block shadow-lg relative w-64 flex-shrink-0',
'h-screen block shadow-lg fixed w-64 flex-shrink-0',
{ hidden: isCollapsed }
)}
>
Expand Down Expand Up @@ -109,7 +109,12 @@ const Layout = () => {
</div>
<div className="flex flex-col w-full md:space-y-4">
<header className="w-full h-16 z-40 flex items-center justify-between">
<div className="block ml-6">
<div
className={classNames('block', {
'ml-72': !isCollapsed,
'ml-6': isCollapsed,
})}
>
<button
className="flex p-2 items-center rounded-full bg-white shadow text-gray-500 text-md"
onClick={handleSidebar}
Expand Down Expand Up @@ -175,7 +180,11 @@ const Layout = () => {
</div>
</div> */}
</header>
<div className="overflow-auto h-screen pb-24 px-4 md:px-6">
<div
className={classNames('pb-24 px-4 md:px-6', {
'ml-64': !isCollapsed,
})}
>
<div className="py-6">
<div className="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
<div className="py-4">
Expand All @@ -186,16 +195,16 @@ const Layout = () => {
</div>
</div>
</div>
<footer className="p-4 z-10 fixed bottom-0 w-full bg-white shadow md:flex md:items-center md:justify-between md:p-6 dark:bg-gray-800">
<span className="text-sm text-gray-500 sm:text-center dark:text-gray-400">
© 2020-2022 SUSE LLC
</span>
<span className="flex items-center mt-3 text-sm text-gray-500 dark:text-gray-400 sm:mt-0">
This tool is free software released under the Apache License,
Version 2.0
</span>
</footer>
</main>
<footer className="p-4 bg-white rounded-lg shadow md:flex md:items-center md:justify-between md:p-6 dark:bg-gray-800">
<span className="text-sm text-gray-500 sm:text-center dark:text-gray-400">
© 2020-2022 SUSE LLC
</span>
<span className="flex items-center mt-3 text-sm text-gray-500 dark:text-gray-400 sm:mt-0">
This tool is free software released under the Apache License, Version
2.0
</span>
</footer>
</>
);
};
Expand Down