diff --git a/client/homebrew/navbar/nav.jsx b/client/homebrew/navbar/nav.jsx index 92b928ffa..f0f26a6b1 100644 --- a/client/homebrew/navbar/nav.jsx +++ b/client/homebrew/navbar/nav.jsx @@ -36,7 +36,7 @@ const Nav = { {icon && } ; } else { - return + return {children} {icon && } {kbd && {kbd}} diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index eb96cb826..17e18e444 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -146,7 +146,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) ); }; - console.log(navSlots); + return ( diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index b94f5c9a2..6eafc591e 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -24,8 +24,8 @@ height: 100%; padding: 5px; cursor: pointer; - max-width:140px; - text-wrap:wrap; + max-width:150px; + text-wrap:pretty; &:has(> button, > a) { padding: 0; @@ -157,8 +157,7 @@ justify-content: center; } &.save { - width: 90px; - + width:90px; &.neverSaved { background-color: @orange; color: white; @@ -277,13 +276,10 @@ position: relative; img { - height: 18px; + height: 15px; padding: 0px; margin: -5px; translate:-5px; - &.inactive { - filter: grayscale(1); - } } } } @@ -297,14 +293,19 @@ height: 100%; text-wrap: nowrap; - &:first-child :is(button, a) { + &:first-child >:is(button, a) { padding-left: 15px; } - &:last-child :is(button, a) { + &:last-child >:is(button, a) { padding-right: 15px; } } + &:last-child ul { + padding-right:10px; + translate:-10px 0; + } + ul { background: #333; font-size: 12px; @@ -313,6 +314,10 @@ .navItem { min-height: 2.2em; + + &.save { + width:100%; + } } .nav-section:not(:last-child, :has(+ .header)) { diff --git a/client/homebrew/pages/basePages/editPage/editorPage.jsx b/client/homebrew/pages/basePages/editPage/editorPage.jsx index 672b66064..c881ce873 100644 --- a/client/homebrew/pages/basePages/editPage/editorPage.jsx +++ b/client/homebrew/pages/basePages/editPage/editorPage.jsx @@ -277,7 +277,6 @@ const EditorPage = (props)=>{ //======----- Google Toggle Button -----====== const closeAlerts = (e)=>{ - e.stopPropagation(); //Only handle click once so alert doesn't reopen setAlertTrashedGoogleBrew(false); setAlertNoGoogleToTransfer(false); setConfirmGoogleTransfer(false); @@ -310,16 +309,15 @@ const EditorPage = (props)=>{ const errorExists = alertNoGoogleToTransfer || alertOwnershipToTransfer || alertTrashedGoogleBrew || confirmGoogleTransfer; return (<> This brew is in {saveGoogle ? 'Google Drive' : 'The Homebrewery'} - + {saveGoogle ? 'Transfer to Homebrewery' : 'Transfer to Drive'} - {saveGoogle? '' : } + {saveGoogle? '' : } {errorExists && {alertOwnershipToTransfer && ( <> You must be the Owner to transfer between the Homebrewery and Google Drive! The owner of this file is {currentBrew.authors[0]}. - Okay > )} @@ -330,7 +328,7 @@ const EditorPage = (props)=>{ Sign In - Not Now + Not Now > )} @@ -347,9 +345,8 @@ const EditorPage = (props)=>{ {saveGoogle ? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?' : 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'} - Yes - No + No > )} }