mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-08-06 06:47:38 +00:00
Merge branch 'master' into fix-editor-theme-saving-incorrectly
This commit is contained in:
@@ -61,10 +61,10 @@ const Nav = {
|
|||||||
{icon}
|
{icon}
|
||||||
</a>;
|
</a>;
|
||||||
} else {
|
} else {
|
||||||
return <div {...props} className={classes} onClick={this.handleClick} >
|
return <button {...props} className={classes} onClick={this.handleClick} >
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
{icon}
|
{icon}
|
||||||
</div>;
|
</button>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ const EditPage = (props)=>{
|
|||||||
|
|
||||||
// #5 - No unsaved changes, and has never been saved, hide the button
|
// #5 - No unsaved changes, and has never been saved, hide the button
|
||||||
if(neverSaved)
|
if(neverSaved)
|
||||||
return <Nav.item className='save neverSaved'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
||||||
|
|
||||||
// DEFAULT - No unsaved changes, show SAVED
|
// DEFAULT - No unsaved changes, show SAVED
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ const HomePage =(props)=>{
|
|||||||
|
|
||||||
// #5 - No unsaved changes, and has never been saved, hide the button
|
// #5 - No unsaved changes, and has never been saved, hide the button
|
||||||
if(neverSaved)
|
if(neverSaved)
|
||||||
return <Nav.item className='save neverSaved'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
||||||
|
|
||||||
// DEFAULT - No unsaved changes, show SAVED
|
// DEFAULT - No unsaved changes, show SAVED
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ const NewPage = (props)=>{
|
|||||||
|
|
||||||
// #5 - No unsaved changes, and has never been saved, hide the button
|
// #5 - No unsaved changes, and has never been saved, hide the button
|
||||||
if(neverSaved)
|
if(neverSaved)
|
||||||
return <Nav.item className='save neverSaved'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
||||||
|
|
||||||
// DEFAULT - No unsaved changes, show SAVED
|
// DEFAULT - No unsaved changes, show SAVED
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
|
|||||||
Reference in New Issue
Block a user