tloncorp/landscape
1
1
Fork 0
mirror of https://github.com/tloncorp/landscape.git synced 2024-12-03 02:00:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from urbit/ja/pref-pane-scroll

Browse Source 
landscape: fix system preferences scrolling
This commit is contained in:
tomholford 2022-12-17 16:38:29 +07:00 committed by GitHub
commit 3e6ca5819c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/preferences/SystemPreferences.tsx
View File

@ -108,7 +108,7 @@ export const SystemPreferences = (
>
<div className="system-preferences-grid bg-gray-50">
<Route exact={isMobile} path={match.url}>
<aside className="system-preferences-aside min-h-fit max-h-[85vh] w-full min-w-60 flex flex-col border-r-2 border-gray-50 bg-white py-4 font-semibold text-black sm:w-auto sm:py-8 sm:text-gray-600">
<aside className="system-preferences-aside min-h-fit max-h-[calc(100vh-6.25rem)] w-full min-w-60 flex flex-col border-r-2 border-gray-50 bg-white py-4 font-semibold text-black sm:w-auto sm:py-8 sm:text-gray-600">
<nav className="flex flex-col px-2 sm:px-6">
<SearchSystemPreferences subUrl={subUrl} />
<span className="pt-1 pl-2 pb-3 text-sm font-semibold text-gray-400">
@ -212,7 +212,7 @@ export const SystemPreferences = (
</aside>
</Route>
<Route path={settingsPath}>
<section className="system-preferences-content flex min-h-[60vh] flex-1 flex-col bg-gray-50 p-4 text-gray-800 sm:p-8">
<section className="system-preferences-content min-h-fit max-h-[calc(100vh-6.25rem)] flex-1 flex-col bg-gray-50 p-4 text-gray-800 sm:p-8">
<Switch>
<Route path={`${match.url}/apps/:desk`} component={AppPrefs} />
<Route path={`${match.url}/help`} component={Help} />

14
ui/src/styles/grids.css
View File

@ -65,16 +65,18 @@
}
.system-preferences-grid {
display: grid;
grid-template-columns: 20rem 1fr;
grid-template-rows: auto;
@media (min-width: 640px){
.system-preferences-grid {
display: grid;
grid-template-columns: 20rem 1fr;
grid-template-rows: auto;
}
}
.system-preferences-aside {
overflow-y: scroll;
overflow-y: auto;
}
.system-preferences-content {
overflow-y: scroll;
overflow-y: auto;
}