mirror of
https://github.com/EnixCoda/Gitako.git
synced 2026-03-11 08:54:44 +00:00
refactor: update settings layout
This commit is contained in:
parent
fcdef87b2a
commit
8819984f98
4 changed files with 12 additions and 26 deletions
|
|
@ -2,7 +2,6 @@ import { Label, Text } from '@primer/react'
|
|||
import { LoadingIndicator } from 'components/LoadingIndicator'
|
||||
import { SearchBar } from 'components/SearchBar'
|
||||
import * as React from 'react'
|
||||
import { cx } from 'utils/cx'
|
||||
import { run } from 'utils/general'
|
||||
import { useLoadedContext } from 'utils/hooks/useLoadedContext'
|
||||
import { VisibleNodes } from 'utils/VisibleNodesGenerator'
|
||||
|
|
@ -39,10 +38,9 @@ export type NodeRendererContext = {
|
|||
|
||||
type Props = {
|
||||
metaData: MetaData
|
||||
freeze: boolean
|
||||
}
|
||||
|
||||
export function FileExplorer({ freeze, metaData }: Props) {
|
||||
export function FileExplorer({ metaData }: Props) {
|
||||
const visibleNodesGenerator = useVisibleNodesGenerator(metaData)
|
||||
const visibleNodes = useVisibleNodes(visibleNodesGenerator)
|
||||
|
||||
|
|
@ -82,7 +80,7 @@ export function FileExplorer({ freeze, metaData }: Props) {
|
|||
useFocusFileExplorerOnFirstRender()
|
||||
|
||||
return (
|
||||
<div className={cx(`file-explorer`, { freeze })} tabIndex={-1} onKeyDown={handleKeyDown}>
|
||||
<div className={`file-explorer`} tabIndex={-1} onKeyDown={handleKeyDown}>
|
||||
{run(() => {
|
||||
switch (state) {
|
||||
case 'tree-loading':
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ export function SideBar() {
|
|||
case 'error-due-to-auth':
|
||||
return <AccessDeniedDescription />
|
||||
default:
|
||||
return metaData && <FileExplorer metaData={metaData} freeze={showSettings} />
|
||||
return metaData && <FileExplorer metaData={metaData} />
|
||||
}
|
||||
})}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import { ChevronDownIcon } from '@primer/octicons-react'
|
||||
import { Box } from '@primer/react'
|
||||
import { Footer } from 'components/Footer'
|
||||
import { RoundIconButton } from 'components/RoundIconButton'
|
||||
import { platform } from 'platforms'
|
||||
import { GitHub } from 'platforms/GitHub'
|
||||
|
|
@ -98,6 +99,7 @@ export function SettingsBarContent({ toggleShow }: { toggleShow: () => void }) {
|
|||
</div>
|
||||
</SettingsSection>
|
||||
</Box>
|
||||
<Footer toggleShowSettings={toggleShow} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -418,6 +418,7 @@ $minimal-z-index: max(
|
|||
}
|
||||
.#{$name}-side-bar-body {
|
||||
$button-size: 32px;
|
||||
|
||||
position: relative;
|
||||
width: var(--gitako-width);
|
||||
height: 100%;
|
||||
|
|
@ -425,6 +426,7 @@ $minimal-z-index: max(
|
|||
flex-direction: column;
|
||||
background: var(--color-bg-subtle);
|
||||
border-left: 1px solid var(--color-border-default);
|
||||
|
||||
.octicon-wrapper {
|
||||
display: inline-block;
|
||||
color: var(--color-fg-subtle);
|
||||
|
|
@ -501,22 +503,6 @@ $minimal-z-index: max(
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-wrap: nowrap;
|
||||
&.freeze {
|
||||
filter: blur(1.5px) opacity(0.6) grayscale(0.9) brightness(0.8);
|
||||
transition: filter 0.25s ease;
|
||||
&:hover {
|
||||
filter: blur(1.5px) opacity(0.6) grayscale(0.9) brightness(0.9);
|
||||
}
|
||||
&:active {
|
||||
filter: blur(1.5px) opacity(0.6) grayscale(0.9) brightness(0.7);
|
||||
}
|
||||
cursor: pointer;
|
||||
|
||||
> * {
|
||||
pointer-events: none;
|
||||
user-select: none;
|
||||
}
|
||||
}
|
||||
|
||||
.search-input {
|
||||
padding-left: 0;
|
||||
|
|
@ -770,19 +756,19 @@ $minimal-z-index: max(
|
|||
}
|
||||
|
||||
.#{$name}-settings-bar {
|
||||
background: var(--color-bg-subtle);
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
max-height: calc(100vh - 240px);
|
||||
min-height: 240px;
|
||||
z-index: 1;
|
||||
z-index: 2;
|
||||
overflow: hidden; // prevent box-shadow of children overflow
|
||||
background: var(--color-bg-subtle);
|
||||
|
||||
&-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
border-top: 1px solid var(--color-border-muted);
|
||||
padding: 10px;
|
||||
box-shadow: 0 1px 8px 0 rgba(0, 0, 0, 0.2), 0 3px 4px 0 rgba(0, 0, 0, 0.14),
|
||||
0 3px 3px -2px rgba(0, 0, 0, 0.12);
|
||||
|
|
|
|||
Loading…
Reference in a new issue