space at the bottom of FE

pull/3215/head
lianahus 2 years ago committed by Aniket
parent 0eb62bf44c
commit c163278f49
  1. 4
      libs/remix-ui/tree-view/src/lib/remix-ui-tree-view.tsx
  2. 2
      libs/remix-ui/workspace/src/lib/components/file-explorer.tsx
  3. 6
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@ -7,11 +7,9 @@ export const TreeView = (props: TreeViewProps) => {
const { children, id, ...otherProps } = props const { children, id, ...otherProps } = props
return ( return (
<div className='pb-4 mb-4'> <ul data-id={`treeViewUl${id}`} className="ul_tv ml-0 pl-2" { ...otherProps }>
<ul data-id={`treeViewUl${id}`} className="ul_tv ml-0 pl-2 mb-2" { ...otherProps }>
{ children } { children }
</ul> </ul>
</div>
) )
} }

@ -454,7 +454,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
</div> </div>
} }
expand={true}> expand={true}>
<div className='pb-2'> <div className='pb-4 mb-4'>
<TreeView id='treeViewMenu'> <TreeView id='treeViewMenu'>
{ {
files[ROOT_PATH] && Object.keys(files[ROOT_PATH]).map((key, index) => <FileRender files[ROOT_PATH] && Object.keys(files[ROOT_PATH]).map((key, index) => <FileRender

@ -591,7 +591,7 @@ export function Workspace () {
return ( return (
<div className='d-flex flex-column justify-content-between h-100'> <div className='d-flex flex-column justify-content-between h-100'>
<div className='remixui_container overflow-auto' style={{ maxHeight: selectedWorkspace && selectedWorkspace.isGitRepo ? '95%' : '100%' }}> <div className='remixui_container overflow-auto' style={{ maxHeight: selectedWorkspace && selectedWorkspace.isGitRepo ? '95%' : '100%' }}>
<div className='d-flex flex-column w-100 remixui_fileexplorer' data-id="remixUIWorkspaceExplorer" onClick={resetFocus}> <div className='d-flex flex-column w-100 mb-1 remixui_fileexplorer' data-id="remixUIWorkspaceExplorer" onClick={resetFocus}>
<div> <div>
<header> <header>
<div className="mx-2 mb-2 d-flex flex-column"> <div className="mx-2 mb-2 d-flex flex-column">
@ -686,7 +686,7 @@ export function Workspace () {
</div> </div>
</header> </header>
</div> </div>
<div className='h-100 remixui_fileExplorerTree' onFocus={() => { toggleDropdown(false) }}> <div className='h-100 mb-4 pb-4 remixui_fileExplorerTree' onFocus={() => { toggleDropdown(false) }}>
<div className='h-100'> <div className='h-100'>
{ (global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning) && <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>} { (global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning) && <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>}
{ !(global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning) && { !(global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning) &&
@ -730,7 +730,7 @@ export function Workspace () {
} }
{ global.fs.localhost.isRequestingLocalhost && <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div> } { global.fs.localhost.isRequestingLocalhost && <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div> }
{ (global.fs.mode === 'localhost' && global.fs.localhost.isSuccessfulLocalhost) && { (global.fs.mode === 'localhost' && global.fs.localhost.isSuccessfulLocalhost) &&
<div className='h-100 filesystemexplorer remixui_treeview'> <div className='h-100 filesystemexplorer pb-4 mb-4 remixui_treeview'>
<FileExplorer <FileExplorer
name='localhost' name='localhost'
menuItems={['createNewFile', 'createNewFolder']} menuItems={['createNewFile', 'createNewFolder']}

Loading…
Cancel
Save