mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-18 09:48:44 +00:00
suggested changes
This commit is contained in:
@@ -52,7 +52,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
<Nav.item icon='fas fa-download' href={`/download/${shareLink}`} disabled={!brew?.shareId}>
|
<Nav.item icon='fas fa-download' href={`/download/${shareLink}`} disabled={!brew?.shareId}>
|
||||||
Download raw text
|
Download raw text
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'editPage' && pageName !== 'editPage'} />
|
<PrintNavItem disabled={pageName !== 'newPage' && pageName !== 'homePage' && pageName !== 'editPage'} />
|
||||||
</div>
|
</div>
|
||||||
{navSlots.file}
|
{navSlots.file}
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
@@ -92,7 +92,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props })
|
|||||||
Patreon
|
Patreon
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
</div>
|
</div>
|
||||||
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} />
|
<ShareNavItem brew={brew} disabled={!brew?.shareId} currentPage={currentPage} pageName={pageName} />
|
||||||
{navSlots.go}
|
{navSlots.go}
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -153,9 +153,16 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.save {
|
&.save {
|
||||||
width: 100px;
|
width: 130px;
|
||||||
|
padding-left:30px;
|
||||||
display:grid;
|
display:grid;
|
||||||
place-items: stretch;
|
place-items: stretch;
|
||||||
|
align-items: stretch;
|
||||||
|
|
||||||
|
i {
|
||||||
|
place-self:center;
|
||||||
|
left:10px;
|
||||||
|
}
|
||||||
|
|
||||||
&.neverSaved {
|
&.neverSaved {
|
||||||
background-color: @orange;
|
background-color: @orange;
|
||||||
@@ -176,6 +183,7 @@
|
|||||||
.navItem,
|
.navItem,
|
||||||
.menu-wrapper {
|
.menu-wrapper {
|
||||||
--activeTriggerColor: #666;
|
--activeTriggerColor: #666;
|
||||||
|
text-transform: capitalize;
|
||||||
|
|
||||||
&: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
|
||||||
@@ -192,6 +200,11 @@
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:has( >i ){
|
||||||
|
padding-left: 25px;
|
||||||
|
position:relative;
|
||||||
|
}
|
||||||
|
|
||||||
i {
|
i {
|
||||||
position:absolute;
|
position:absolute;
|
||||||
left:5px;
|
left:5px;
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ const RecentItems = createReactClass({
|
|||||||
|
|
||||||
renderDropdown : function(){
|
renderDropdown : function(){
|
||||||
const makeItems = (brews)=>{
|
const makeItems = (brews)=>{
|
||||||
console.log(brews);
|
|
||||||
if(brews.length === 0) return <Nav.item>No recent brews</Nav.item>
|
if(brews.length === 0) return <Nav.item>No recent brews</Nav.item>
|
||||||
return <div className='nav-section'>
|
return <div className='nav-section'>
|
||||||
{_.map(brews, (brew, i)=>{
|
{_.map(brews, (brew, i)=>{
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ const getRedditLink = (brew)=>{
|
|||||||
return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
|
return `https://www.reddit.com/r/UnearthedArcana/submit?title=${encodeURIComponent(brew.title.toWellFormed())}&text=${encodeURIComponent(text)}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ({ brew, disabled, currentPage })=>{
|
export default ({ brew, disabled, currentPage, pageName })=>{
|
||||||
return (
|
return (
|
||||||
<div className='nav-section'>
|
<div className='nav-section'>
|
||||||
<Nav.item icon='fas fa-code' href={`/source/${getShareId(brew)}`}>
|
<Nav.item icon='fas fa-code' href={`/source/${getShareId(brew)}`} disabled={disabled}>
|
||||||
View Raw Text
|
View Raw Text
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item icon={'fas fa-pencil'} href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId}>
|
<Nav.item icon={'fas fa-pencil'} href={`/edit/${getEditId(brew)}`} disabled={disabled || !brew?.editId || pageName === 'editPage'}>
|
||||||
edit this brew
|
edit this brew
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
<Nav.item icon={'fas fa-share-alt'} href={`/share/${getShareId(brew)}`} disabled={disabled}>
|
<Nav.item icon={'fas fa-share-alt'} href={`/share/${getShareId(brew)}`} disabled={disabled}>
|
||||||
|
|||||||
@@ -259,12 +259,12 @@ const EditorPage = (props)=>{
|
|||||||
return <Nav.item className='save neverSaved' onClick={()=>trySave(true, true, saveGoogle)} color='blue' icon='fas fa-save'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' onClick={()=>trySave(true, true, saveGoogle)} color='blue' icon='fas fa-save'>save now</Nav.item>;
|
||||||
|
|
||||||
if(autoSaveEnabled)
|
if(autoSaveEnabled)
|
||||||
return <Nav.item className='save saved'>auto-saved</Nav.item>;
|
return <Nav.item className='save saved' icon='fas fa-save'>auto-saved</Nav.item>;
|
||||||
|
|
||||||
if(sandbox)
|
if(sandbox)
|
||||||
return <Nav.item className='save' disabled={true}>no changes</Nav.item>;
|
return <Nav.item className='save' icon='fas fa-save' disabled={true}>no changes</Nav.item>;
|
||||||
|
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved' icon='fas fa-save'>saved</Nav.item>;
|
||||||
};
|
};
|
||||||
|
|
||||||
//TODO: Candidate for refactor/rename; used with history tool to load previous verion; may overlap with snippet injection or handleBrewChange
|
//TODO: Candidate for refactor/rename; used with history tool to load previous verion; may overlap with snippet injection or handleBrewChange
|
||||||
@@ -309,9 +309,8 @@ const EditorPage = (props)=>{
|
|||||||
const errorExists = alertNoGoogleToTransfer || alertOwnershipToTransfer || alertTrashedGoogleBrew || confirmGoogleTransfer;
|
const errorExists = alertNoGoogleToTransfer || alertOwnershipToTransfer || alertTrashedGoogleBrew || confirmGoogleTransfer;
|
||||||
return (<>
|
return (<>
|
||||||
<Nav.header>This brew is in {saveGoogle ? 'Google Drive' : 'The Homebrewery'}</Nav.header>
|
<Nav.header>This brew is in {saveGoogle ? 'Google Drive' : 'The Homebrewery'}</Nav.header>
|
||||||
<Nav.item icon={'fas fa-hard-drive'} className='googleDriveStorage' noDismiss='true' onClick={handleGoogleClick}>
|
<Nav.item icon={saveGoogle ? 'fac homebrewery' : 'fab fa-google-drive'} className='googleDriveStorage' noDismiss='true' onClick={handleGoogleClick}>
|
||||||
{saveGoogle ? 'Transfer to Homebrewery' : 'Transfer to Drive'}
|
{saveGoogle ? 'Transfer to Homebrewery' : 'Transfer to Drive'}
|
||||||
{saveGoogle? '' : <img src={googleDriveIcon} alt='Google Drive icon' /> }
|
|
||||||
</Nav.item>
|
</Nav.item>
|
||||||
{errorExists && <Nav.item className='errorContainer' >
|
{errorExists && <Nav.item className='errorContainer' >
|
||||||
{alertOwnershipToTransfer && (
|
{alertOwnershipToTransfer && (
|
||||||
|
|||||||
@@ -34,3 +34,4 @@
|
|||||||
.flow-spread { mask-image : url('../icons/flow-spread.svg'); }
|
.flow-spread { mask-image : url('../icons/flow-spread.svg'); }
|
||||||
.format-card { mask-image: url('../icons/format-card.svg'); }
|
.format-card { mask-image: url('../icons/format-card.svg'); }
|
||||||
.compressed-grid { mask-image: url('../icons//compressed-grid.svg'); }
|
.compressed-grid { mask-image: url('../icons//compressed-grid.svg'); }
|
||||||
|
.homebrewery { mask-image: url('../homebrew/thumbnail.svg'); }
|
||||||
Reference in New Issue
Block a user