mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-19 05:08:15 +00:00
some suggested changes
This commit is contained in:
@@ -27,17 +27,17 @@ const Nav = {
|
|||||||
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) {
|
||||||
return <button className={classes} disabled>{children}{icon && <i className={icon}></i>}</button>;
|
return <button className={classes} disabled>{icon && <i className={icon}></i>}{children}</button>;
|
||||||
}
|
}
|
||||||
if(href){
|
if(href){
|
||||||
return <a className={classes} href={href} target={newTab ? '_blank' : '_self'} {...props}>
|
return <a className={classes} href={href} target={newTab ? '_blank' : '_self'} {...props}>
|
||||||
{children}
|
|
||||||
{icon && <i className={icon}></i>}
|
{icon && <i className={icon}></i>}
|
||||||
|
{children}
|
||||||
</a>;
|
</a>;
|
||||||
} else {
|
} else {
|
||||||
return <button {...props} no-dismiss={noDismiss ? 'true' : undefined} className={classes} onClick={onClick} >
|
return <button {...props} no-dismiss={noDismiss ? 'true' : undefined} className={classes} onClick={onClick} >
|
||||||
{children}
|
|
||||||
{icon && <i className={icon}></i>}
|
{icon && <i className={icon}></i>}
|
||||||
|
{children}
|
||||||
{kbd && <kbd>{kbd}</kbd>}
|
{kbd && <kbd>{kbd}</kbd>}
|
||||||
</button>;
|
</button>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,19 +60,19 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
return (
|
return (
|
||||||
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
|
<Dropdown groupName={'Edit'} customTrigger={<>Edit</>} icon={null} key={'edit'}>
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
<Nav.item 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>
|
||||||
<Nav.item onClick={()=>editor?.redo()} kbd={`${mod} + Shift + z`} disabled={!editor}>
|
<Nav.item icon={'fas fa-redo'} onClick={()=>editor?.redo()} kbd={`${mod} + Shift + z`} disabled={!editor}>
|
||||||
Redo
|
Redo
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item onClick={()=>editor?.find()} kbd={`${mod} + f`} disabled={!editor}>
|
<Nav.item icon={'fas fa-search'} onClick={()=>editor?.find()} kbd={`${mod} + f`} disabled={!editor}>
|
||||||
Find / Replace
|
Find / Replace
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item onClick={()=>editor?.foldCode()} disabled={!editor}>
|
<Nav.item icon={'fas fa-compress-alt'} onClick={()=>editor?.foldCode()} disabled={!editor}>
|
||||||
Fold all lines
|
Fold all lines
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item 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>
|
</div>
|
||||||
@@ -97,7 +97,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
</div>
|
</div>
|
||||||
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} />
|
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} />
|
||||||
{navSlots.go}
|
{navSlots.go}
|
||||||
<Dropdown className='navItem recent' groupName={'Recent Brews'} customTrigger={<>Recent Brews</>} icon={null} key={'recent'}>
|
<Dropdown className='navItem recent' groupName={'Recent Brews'} icon={'fas fa-history'} key={'recent'}>
|
||||||
<RecentNavItem />
|
<RecentNavItem />
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
max-width: 150px;
|
max-width: 220px;
|
||||||
text-wrap: pretty;
|
text-wrap: pretty;
|
||||||
|
|
||||||
&:has(> button, > a) {
|
&:has(> button, > a) {
|
||||||
@@ -153,7 +153,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.save {
|
&.save {
|
||||||
width: 90px;
|
width: 100px;
|
||||||
|
display:grid;
|
||||||
|
place-items: stretch;
|
||||||
|
|
||||||
&.neverSaved {
|
&.neverSaved {
|
||||||
background-color: @orange;
|
background-color: @orange;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
@@ -173,18 +176,32 @@
|
|||||||
.navItem,
|
.navItem,
|
||||||
.menu-wrapper {
|
.menu-wrapper {
|
||||||
--activeTriggerColor: #666;
|
--activeTriggerColor: #666;
|
||||||
|
|
||||||
&:has(ul):not(:has(ul :is(button, a):not(:disabled))) {
|
&:has(ul):not(:has(ul :is(button, a):not(:disabled))) {
|
||||||
color: grey; //faux disabled if all buttons are disabled
|
color: grey; //faux disabled if all buttons are disabled
|
||||||
}
|
}
|
||||||
&:not(.header):hover {
|
&:not(.header):hover {
|
||||||
background: #484848;
|
background: #484848;
|
||||||
}
|
}
|
||||||
&:has(> i, > kbd, > img) {
|
&:not(.header):has(:popover-open) {
|
||||||
|
background: var(--activeTriggerColor);
|
||||||
|
}
|
||||||
|
&:has(> kbd) {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 5px;
|
gap: 5px;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
i {
|
||||||
|
position:absolute;
|
||||||
|
left:5px;
|
||||||
|
|
||||||
|
&.caret {
|
||||||
|
left:unset;
|
||||||
|
right:5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&.header {
|
&.header {
|
||||||
cursor: default;
|
cursor: default;
|
||||||
place-content: center;
|
place-content: center;
|
||||||
@@ -197,6 +214,7 @@
|
|||||||
gap: 5px;
|
gap: 5px;
|
||||||
height: 2.7em;
|
height: 2.7em;
|
||||||
isolation: isolate;
|
isolation: isolate;
|
||||||
|
padding-left:5px;
|
||||||
|
|
||||||
&.header {
|
&.header {
|
||||||
padding: 5px 0;
|
padding: 5px 0;
|
||||||
@@ -245,6 +263,10 @@
|
|||||||
translate: -5px;
|
translate: -5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
span {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
> ul {
|
> ul {
|
||||||
@@ -269,10 +291,11 @@
|
|||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
text-transform: capitalize;
|
text-transform: capitalize;
|
||||||
padding-bottom: 5px;
|
padding-bottom: 5px;
|
||||||
min-width: 80px;
|
min-width: 130px;
|
||||||
|
|
||||||
.navItem {
|
.navItem {
|
||||||
min-height: 2.2em;
|
min-height: 2.2em;
|
||||||
|
padding-left: 25px;
|
||||||
|
|
||||||
&.save {
|
&.save {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -285,6 +308,9 @@
|
|||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
button.menu-item {
|
||||||
|
padding:0;
|
||||||
|
}
|
||||||
li {
|
li {
|
||||||
margin-block: 2px;
|
margin-block: 2px;
|
||||||
}
|
}
|
||||||
@@ -302,7 +328,7 @@
|
|||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: center;
|
place-items: stretch;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
|
|||||||
@@ -25,13 +25,13 @@ const getRedditLink = (brew)=>{
|
|||||||
export default ({ brew, disabled, currentPage })=>{
|
export default ({ brew, disabled, currentPage })=>{
|
||||||
return (
|
return (
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
<Nav.item href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId}>
|
<Nav.item icon={'fas fa-pencil'} href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId}>
|
||||||
edit this brew
|
edit this brew
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item href={`/share/${getShareId(brew)}`} disabled={disabled}>
|
<Nav.item icon={'fas fa-share-alt'} href={`/share/${getShareId(brew)}`} disabled={disabled}>
|
||||||
view share page
|
view share page
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}} disabled={disabled}>
|
<Nav.item icon={'far fa-copy'} onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}`);}} disabled={disabled}>
|
||||||
copy share url
|
copy share url
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
{currentPage > 1 &&
|
{currentPage > 1 &&
|
||||||
@@ -39,7 +39,7 @@ export default ({ brew, disabled, currentPage })=>{
|
|||||||
onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}#p${currentPage}`);}}>
|
onClick={()=>{navigator.clipboard.writeText(`${global.config.baseUrl}/share/${getShareId(brew)}#p${currentPage}`);}}>
|
||||||
copy url (page {currentPage})
|
copy url (page {currentPage})
|
||||||
</Nav.item>}
|
</Nav.item>}
|
||||||
<Nav.item href={!disabled && getRedditLink(brew)} newTab rel='noopener noreferrer' disabled={disabled}>
|
<Nav.item icon={'fab fa-reddit-alien'} href={!disabled && getRedditLink(brew)} newTab rel='noopener noreferrer' disabled={disabled}>
|
||||||
post to reddit
|
post to reddit
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -390,7 +390,9 @@ const EditorPage = (props)=>{
|
|||||||
</div>}
|
</div>}
|
||||||
</Navbar.File>
|
</Navbar.File>
|
||||||
<Navbar.Menu>
|
<Navbar.Menu>
|
||||||
{error? <ErrorNavItem error={error} clearError={clearError} /> : renderSaveButton()}
|
<li className='menu-wrapper'>
|
||||||
|
{error? <ErrorNavItem error={error} clearError={clearError} /> : renderSaveButton()}
|
||||||
|
</li>
|
||||||
</Navbar.Menu>
|
</Navbar.Menu>
|
||||||
</Navbar>
|
</Navbar>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user