suuggested style changes

This commit is contained in:
Víctor Losada Hernández
2026-10-18 15:53:06 +02:00
parent b7193de3a2
commit 94f093eff4
5 changed files with 47 additions and 52 deletions
@@ -1,5 +1,5 @@
@import './client/homebrew/navbar/navbar.less'; @import '@sharedStyles/core.less';
@navbarHeight: 29px;
@viewerToolsHeight : 32px; @viewerToolsHeight : 32px;
.popups { .popups {
+16 -11
View File
@@ -37,11 +37,16 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
} }
return ( return (
<Dropdown className='navItem' groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}> <Dropdown groupName={'File'} customTrigger={<>File</>} icon={null} key={'file'}>
<NewBrewNavItem /> <li className="nav-section">
<Dropdown className='navItem recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}> <Dropdown className='new' groupName={'Create new brews'} icon={'fas fa-plus-square'} key={'new'}>
<RecentNavItem brew={brew} pageName={pageName} /> <NewBrewNavItem />
</Dropdown> </Dropdown>
<Dropdown className='recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}>
<RecentNavItem brew={brew} pageName={pageName} />
</Dropdown>
</li>
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} pageName={pageName} /> <ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} pageName={pageName} />
<li className='nav-section'> <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}>
@@ -61,7 +66,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
const renderEdit = ()=>{ const renderEdit = ()=>{
return ( return (
<Dropdown className='navItem' groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}> <Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
<li 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
@@ -85,7 +90,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
}; };
const renderHelp = ()=>{ const renderHelp = ()=>{
return <Dropdown className='navItem' groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}> return <Dropdown groupName={'Help'} customTrigger={<>Help</>} icon={null} key={'help'}>
<li 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>
@@ -112,14 +117,14 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
return ( return (
<nav> <nav>
<ul> <ul>
<li className='menu-wrapper navItem'> <li className='menu-wrapper'>
<a href='/'>Home</a> <a className=' navItem' href='/'>Home</a>
</li> </li>
{renderFile()} {renderFile()}
{renderEdit()} {renderEdit()}
{renderHelp()} {renderHelp()}
<li className="menu-wrapper navItem"> <li className="menu-wrapper">
<a href='/vault'>Vault</a> <a className='navItem' href='/vault'>Vault</a>
</li> </li>
{navSlots.menu} {navSlots.menu}
</ul> </ul>
+24 -35
View File
@@ -12,15 +12,16 @@
height: @navbarHeight; height: @navbarHeight;
font-size: 15px; font-size: 15px;
user-select:none; user-select:none;
accent-color: white;
.navItem { .navItem, .menu-wrapper > .menu-item {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: start; justify-content: start;
gap:5px;
height: 100%; height: 100%;
padding: 5px; padding: 5px;
cursor: pointer; cursor: pointer;
max-width: 220px;
text-wrap: pretty; text-wrap: pretty;
&:has(> button, > a) { &:has(> button, > a) {
@@ -153,16 +154,7 @@
} }
} }
&.save { &.save {
width: 130px; padding-left:10px;
padding-left:30px;
display:grid;
place-items: stretch;
align-items: stretch;
i {
place-self:center;
left:10px;
}
&.neverSaved { &.neverSaved {
background-color: @orange; background-color: @orange;
@@ -194,24 +186,16 @@
&:not(.header):has(:popover-open) { &:not(.header):has(:popover-open) {
background: var(--activeTriggerColor); background: var(--activeTriggerColor);
} }
&:has(> kbd) {
display: flex;
gap: 5px;
justify-content: space-between;
}
&:has( >i ){
padding-left: 25px;
position:relative;
}
i { i {
position:absolute; width:20px;
left:5px; display:grid;
place-content: center;
&.caret { &.caret {
left:unset; left:unset;
right:5px; right:5px;
margin-left: auto;
} }
&.fa-times { &.fa-times {
position:relative; position:relative;
@@ -294,7 +278,10 @@
> .menu-wrapper { > .menu-wrapper {
height: 100%; height: 100%;
text-wrap: nowrap;
>.navItem {
white-space: nowrap;
}
&:first-child > :is(button, a) { &:first-child > :is(button, a) {
padding-left: 15px; padding-left: 15px;
@@ -309,13 +296,18 @@
font-size: 13px; font-size: 13px;
text-transform: capitalize; text-transform: capitalize;
min-width: 130px; min-width: 130px;
border: 1px solid #666; border: 1px solid currentColor;
border-top:1px solid currentColor;
.navItem {
.menu-wrapper {
min-height: 2.2em; min-height: 2.2em;
padding-left: 25px; }
.navItem, .menu-wrapper > .menu-item {
min-height: 2.2em;
display:flex;
justify-content: flex-start;
align-items: center;
&.save { &.save {
width: 100%; width: 100%;
} }
@@ -323,12 +315,10 @@
&.header { &.header {
padding-left:5px; padding-left:5px;
text-align: center; text-align: center;
background:#00ff0037;
} }
} }
>.navItem:last-child, .nav-section:last-child .navItem:last-child {
padding-bottom: 10px;
}
.nav-section:has(+ .header) { .nav-section:has(+ .header) {
padding-bottom:5px; padding-bottom:5px;
} }
@@ -353,9 +343,7 @@
&:disabled { &:disabled {
color: #777; color: #777;
} }
display: grid;
cursor: pointer; cursor: pointer;
place-items: stretch;
height: 100%; height: 100%;
width: 100%; width: 100%;
padding: 5px 10px; padding: 5px 10px;
@@ -383,5 +371,6 @@
background: #222; background: #222;
padding: 2px 5px; padding: 2px 5px;
border-radius: 5px; border-radius: 5px;
margin-left:auto;
} }
} }
+2 -2
View File
@@ -24,7 +24,7 @@ const getRedditLink = (brew)=>{
export default ({ brew, disabled, currentPage, pageName })=>{ export default ({ brew, disabled, currentPage, pageName })=>{
return ( return (
<div className='nav-section'> <li className='nav-section'>
<Nav.item icon='fas fa-code' href={`/source/${getShareId(brew)}`} disabled={disabled}> <Nav.item icon='fas fa-code' href={`/source/${getShareId(brew)}`} disabled={disabled}>
View Raw Text View Raw Text
</Nav.item> </Nav.item>
@@ -45,6 +45,6 @@ export default ({ brew, disabled, currentPage, pageName })=>{
<Nav.item icon={'fab fa-reddit-alien'} href={!disabled && getRedditLink(brew)} newTab rel='noopener noreferrer' disabled={disabled || pageName === 'sharePage'}> <Nav.item icon={'fab fa-reddit-alien'} href={!disabled && getRedditLink(brew)} newTab rel='noopener noreferrer' disabled={disabled || pageName === 'sharePage'}>
post to reddit post to reddit
</Nav.item> </Nav.item>
</div> </li>
); );
}; };
@@ -28,6 +28,8 @@ const SAVEKEY_PREFIX = 'HB_editor_defaultSave_';
const SAVE_TIMEOUT = 10000; //Autosave 10 seconds after last change const SAVE_TIMEOUT = 10000; //Autosave 10 seconds after last change
const UNSAVED_WARNING_TIMEOUT = 900000; //Warn user afer 15 minutes of unsaved changes const UNSAVED_WARNING_TIMEOUT = 900000; //Warn user afer 15 minutes of unsaved changes
const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds
const isMac = navigator.platform.toUpperCase().includes('MAC');
const mod = isMac ? '⌘' : 'Ctrl';
const EditorPage = (props)=>{ const EditorPage = (props)=>{
const { const {
@@ -377,9 +379,8 @@ const EditorPage = (props)=>{
<Navbar brew={currentBrew} editor={editorRef.current} pageName={pageName} title={pageTitle} account={global.account} currentPage={currentBrewRendererPageNum}> <Navbar brew={currentBrew} editor={editorRef.current} pageName={pageName} title={pageTitle} account={global.account} currentPage={currentBrewRendererPageNum}>
<Navbar.File> <Navbar.File>
<Nav.item <Nav.item
className='save'
onClick={()=>trySave(true, true, saveGoogle)} onClick={()=>trySave(true, true, saveGoogle)}
icon='fas fa-save'> icon='fas fa-save' kbd={`${mod} + S`}>
save now save now
</Nav.item> </Nav.item>
{(pageName == 'editPage') && renderAutoSaveButton()} {(pageName == 'editPage') && renderAutoSaveButton()}