fix cursor and nav alignment

This commit is contained in:
Víctor Losada Hernández
2026-10-14 22:54:50 +02:00
parent 372df2d452
commit d9ee61e290
3 changed files with 23 additions and 48 deletions
-22
View File
@@ -1,29 +1,7 @@
import React from 'react'; import React from 'react';
import cx from 'classnames'; import cx from 'classnames';
import NaturalCritIcon from '@components/svg/naturalcrit-d20.svg.jsx';
const Nav = { const Nav = {
base : ({ children, className, ...props })=>{
return <nav className={className}>
{children}
</nav>;
},
logo : ()=>{
return <a className='navLogo' href='https://www.naturalcrit.com'>
<NaturalCritIcon />
<span className='name'>
Natural<span className='crit'>Crit</span>
</span>
</a>;
},
section : ({ children, className, ...props })=>{
return <div className={cx([`navSection`, className])}>
{children}
</div>;
},
item : ({ icon, kbd, href, newTab, onClick, children, className, disabled, noDismiss, ...props })=>{ item : ({ icon, kbd, href, newTab, onClick, children, className, disabled, noDismiss, ...props })=>{
const classes = cx('navItem', className); const classes = cx('navItem', className);
if(disabled) { if(disabled) {
+21 -21
View File
@@ -37,23 +37,23 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
} }
return ( return (
<Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}> <Dropdown className='navItem' groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
<NewBrewNavItem /> <NewBrewNavItem />
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} pageName={pageName} />
<Dropdown className='navItem recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}> <Dropdown className='navItem recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}>
<RecentNavItem brew={brew} pageName={pageName} /> <RecentNavItem brew={brew} pageName={pageName} />
</Dropdown> </Dropdown>
<div className='nav-section'> <ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} pageName={pageName} />
<li className='nav-section'>
<Nav.item icon={'fas fa-clone'} href={`/new/${brew?.shareId}`} disabled={!brew?.shareId}> <Nav.item icon={'fas fa-clone'} href={`/new/${brew?.shareId}`} disabled={!brew?.shareId}>
Clone Brew Clone Brew
</Nav.item> </Nav.item>
</div> </li>
<div className='nav-section'> <li className='nav-section'>
<Nav.item icon='far fa-file-lines' href={`/download/${shareLink}`} disabled={!brew?.shareId}> <Nav.item icon='far fa-file-lines' href={`/download/${shareLink}`} disabled={!brew?.shareId}>
<span style={{textTransform:"none"}}>Export As .txt</span> <span style={{textTransform:"none"}}>Export As .txt</span>
</Nav.item> </Nav.item>
<PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'homePage' && pageName !== 'editPage' && pageName !== 'sharePage'} /> <PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'homePage' && pageName !== 'editPage' && pageName !== 'sharePage'} />
</div> </li>
{navSlots.file} {navSlots.file}
</Dropdown> </Dropdown>
); );
@@ -61,8 +61,8 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
const renderEdit = ()=>{ const renderEdit = ()=>{
return ( return (
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}> <Dropdown className='navItem' groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
<div className='nav-section'> <li className='nav-section'>
<Nav.item icon={'fas fa-undo'} onClick={()=>editor?.undo()} kbd={`${mod} + z`} disabled={!editor}> <Nav.item icon={'fas fa-undo'} onClick={()=>editor?.undo()} kbd={`${mod} + z`} disabled={!editor}>
Undo Undo
</Nav.item> </Nav.item>
@@ -78,32 +78,32 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
<Nav.item icon={'fas fa-expand-alt'} onClick={()=>editor?.unfoldCode()} disabled={!editor}> <Nav.item icon={'fas fa-expand-alt'} onClick={()=>editor?.unfoldCode()} disabled={!editor}>
Unfold all lines Unfold all lines
</Nav.item> </Nav.item>
</div> </li>
{navSlots.edit} {navSlots.edit}
</Dropdown> </Dropdown>
); );
}; };
const renderHelp = ()=>{ const renderHelp = ()=>{
return <Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}> return <Dropdown className='navItem' groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
<div className="nav-section"> <li className="nav-section">
<Nav.item icon='fab fa-discord' href='https://discord.com/invite/by3deKx' newTab={true} rel='noopener noreferrer'>Our Discord Server</Nav.item> <Nav.item icon='fab fa-discord' href='https://discord.com/invite/by3deKx' newTab={true} rel='noopener noreferrer'>Our Discord Server</Nav.item>
<Nav.item icon='fab fa-reddit' href='https://www.reddit.com/r/homebrewery' newTab={true} rel='noopener noreferrer'>Our Subreddit</Nav.item> <Nav.item icon='fab fa-reddit' href='https://www.reddit.com/r/homebrewery' newTab={true} rel='noopener noreferrer'>Our Subreddit</Nav.item>
</div> </li>
<HelpNavItem /> <HelpNavItem />
<div className="nav-section"> <li className="nav-section">
<Nav.item icon='far fa-file-alt' href='/changelog' newTab={false} rel='noopener noreferrer'> <Nav.item icon='far fa-file-alt' href='/changelog' newTab={false} rel='noopener noreferrer'>
Changelog Changelog
</Nav.item> </Nav.item>
<Nav.item icon='fab fa-github' href='https://github.com/naturalcrit/homebrewery' newTab={true} rel='noopener noreferrer'> <Nav.item icon='fab fa-github' href='https://github.com/naturalcrit/homebrewery' newTab={true} rel='noopener noreferrer'>
Github Github
</Nav.item> </Nav.item>
</div> </li>
<div className="nav-section"> <li className="nav-section">
<Nav.item className='patreon' newTab={true} href='https://www.patreon.com/NaturalCrit' icon='fas fa-heart'> <Nav.item className='patreon' newTab={true} href='https://www.patreon.com/NaturalCrit' icon='fas fa-heart'>
Patreon Patreon
</Nav.item> </Nav.item>
</div> </li>
{navSlots.help} {navSlots.help}
</Dropdown>; </Dropdown>;
@@ -112,18 +112,18 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
return ( return (
<nav> <nav>
<ul> <ul>
<li className='menu-wrapper'> <li className='menu-wrapper navItem'>
<a href='/'>Home</a> <a href='/'>Home</a>
</li> </li>
{renderFile()} {renderFile()}
{renderEdit()} {renderEdit()}
{renderHelp()} {renderHelp()}
<Nav.item href='/vault' newTab={false} rel='noopener noreferrer'> <li className="menu-wrapper navItem">
Vault <a href='/vault'>Vault</a>
</Nav.item> </li>
{navSlots.menu} {navSlots.menu}
</ul> </ul>
{pageName !== 'sharePage' && <Nav.header className='brewTitle'>{title}</Nav.header>} {pageName !== 'sharePage' && <Nav.header className='brewTitle navItem'>{title}</Nav.header>}
<MetadataNavItem brew={brew} pageName={pageName}></MetadataNavItem> <MetadataNavItem brew={brew} pageName={pageName}></MetadataNavItem>
<ul> <ul>
<AccountNavItem /> <AccountNavItem />
+2 -5
View File
@@ -28,6 +28,7 @@
padding: 0; padding: 0;
} }
&.brewTitle { &.brewTitle {
align-items: stretch;
width: 100%; width: 100%;
max-width: none; max-width: none;
overflow: hidden; overflow: hidden;
@@ -344,11 +345,6 @@
margin-block: 2px; margin-block: 2px;
} }
} }
&:last-child ul {
padding-right: 10px;
translate: -10px 0;
}
} }
button, button,
@@ -357,6 +353,7 @@
color: #777; color: #777;
} }
display: grid; display: grid;
cursor: pointer;
place-items: stretch; place-items: stretch;
height: 100%; height: 100%;
width: 100%; width: 100%;