From f1c3507a9f345a513b4c5883eec0e2ec59a85530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 31 Jan 2024 15:45:27 +0100 Subject: [PATCH 01/12] initial commit --- client/homebrew/brewRenderer/brewRenderer.jsx | 10 +++++----- client/homebrew/pages/basePages/listPage/listPage.jsx | 4 ++-- client/homebrew/pages/printPage/printPage.jsx | 6 +++--- client/template.js | 4 ++-- shared/naturalcrit/codeEditor/codeEditor.jsx | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 9208a2b90..ab08eecb9 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -20,9 +20,9 @@ const PAGE_HEIGHT = 1056; const INITIAL_CONTENT = dedent` - + - +
`; @@ -206,11 +206,11 @@ const BrewRenderer = (props)=>{ - + {baseThemePath && - + } - + {/* Apply CSS from Style tab and render pages from Markdown tab */} {state.isMounted diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx index d0cd11ec6..b2086939f 100644 --- a/client/homebrew/pages/basePages/listPage/listPage.jsx +++ b/client/homebrew/pages/basePages/listPage/listPage.jsx @@ -220,8 +220,8 @@ const ListPage = createClass({ render : function(){ return
{/**/} - - + + {this.props.navItems} {this.renderSortOptions()} diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx index 37376d4b2..7d7fc437b 100644 --- a/client/homebrew/pages/printPage/printPage.jsx +++ b/client/homebrew/pages/printPage/printPage.jsx @@ -93,11 +93,11 @@ const PrintPage = createClass({ return
- + {baseThemePath && - + } - + {/* Apply CSS from Style tab */} {this.renderStyle()}
diff --git a/client/template.js b/client/template.js index e8ac8e22f..f72238eed 100644 --- a/client/template.js +++ b/client/template.js @@ -12,9 +12,9 @@ const template = async function(name, title='', props = {}){ - + - + ${ogMetaTags} diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx index 0a99570db..a5232a42b 100644 --- a/shared/naturalcrit/codeEditor/codeEditor.jsx +++ b/shared/naturalcrit/codeEditor/codeEditor.jsx @@ -436,7 +436,7 @@ const CodeEditor = createClass({ render : function(){ return <> - +
; } From 19bb9705b67f99defcc797be4e4daec2aa286eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Fri, 9 Feb 2024 13:33:41 +0100 Subject: [PATCH 02/12] initial commit --- shared/naturalcrit/nav/nav.less | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/shared/naturalcrit/nav/nav.less b/shared/naturalcrit/nav/nav.less index e3a58a33a..8ac29f420 100644 --- a/shared/naturalcrit/nav/nav.less +++ b/shared/naturalcrit/nav/nav.less @@ -87,10 +87,15 @@ nav{ position : relative; display : block; width : 100%; - vertical-align : middle; - padding : 8px 5px; + padding : 5px 20px 5px 12px; border : 1px solid #888; border-bottom : 0; + i:before { + position:absolute; + right:12px; + top:50%; + translate: 0 -50%; + } } } } From b5301ff9784a97b1751112550d776c9b97d5b38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 27 Feb 2024 21:53:44 +0100 Subject: [PATCH 03/12] requested changes --- client/homebrew/navbar/navbar.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 73671abbb..5af996238 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -247,9 +247,10 @@ overflow : hidden auto; .navItem { position : relative; - display : block; + display : flex; + justify-content : space-between; + align-items : center; width : 100%; - padding : 8px 5px; border : 1px solid #888888; border-bottom : 0; animation-name : glideDropDown; From 1d317788fe3727030f007fa69f7aa055f6a60bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 27 Feb 2024 22:12:32 +0100 Subject: [PATCH 04/12] fix undefined class --- client/homebrew/navbar/account.navitem.jsx | 2 +- client/homebrew/navbar/help.navitem.jsx | 2 +- client/homebrew/pages/editPage/editPage.jsx | 2 +- client/homebrew/pages/sharePage/sharePage.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx index 6b412c368..b3b6d06b0 100644 --- a/client/homebrew/navbar/account.navitem.jsx +++ b/client/homebrew/navbar/account.navitem.jsx @@ -61,7 +61,7 @@ const Account = createClass({ render : function(){ // Logged in if(global.account){ - return + return + return need help? diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index d5af310b5..3329d1ba6 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -362,7 +362,7 @@ const EditPage = createClass({ } - + share diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 981ad0126..c8fad41c4 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -60,7 +60,7 @@ const SharePage = createClass({ {this.props.brew.shareId && <> - + source From c4499fcc26b59bb39ef861db1528293e5245bde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 27 Feb 2024 22:12:40 +0100 Subject: [PATCH 05/12] min-width for elements --- client/homebrew/navbar/navbar.less | 1 + 1 file changed, 1 insertion(+) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 5af996238..e818147e2 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -237,6 +237,7 @@ } .navDropdownContainer { position : relative; + min-width: 110px; .navDropdown { position : absolute; top : 28px; From 0310eee6856e16ad5d905bdcf6aa1753a6f92219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 27 Feb 2024 22:18:04 +0100 Subject: [PATCH 06/12] increase minimum width --- client/homebrew/navbar/navbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index e818147e2..008f25d65 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -237,7 +237,7 @@ } .navDropdownContainer { position : relative; - min-width: 110px; + min-width: 120px; .navDropdown { position : absolute; top : 28px; From 3482330629ca4fa016aaefa2676d2d4afdfb658d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 19:05:58 +0100 Subject: [PATCH 07/12] adjust to work with overflow --- client/homebrew/navbar/navbar.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 4983aa696..d41f39f7f 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -242,16 +242,17 @@ .navDropdown { position : absolute; top : 28px; - left : 0px; + right : 0px; z-index : 10000; - width : 100%; + width : fit-content; max-height : calc(100vh - 28px); overflow : hidden auto; .navItem { position : relative; - display : block; + display : flex; + justify-content : space-between; + align-items : center; width : 100%; - padding : 8px 5px; border : 1px solid #888888; border-bottom : 0; animation-name : glideDropDown; From c7a2e849272eb86e8fd392cc0e7a9735e5554817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 19:13:35 +0100 Subject: [PATCH 08/12] no wrapping text --- client/homebrew/navbar/navbar.less | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index d41f39f7f..601310a71 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -240,19 +240,23 @@ .navDropdownContainer { position : relative; .navDropdown { - position : absolute; - top : 28px; - right : 0px; - z-index : 10000; - width : fit-content; - max-height : calc(100vh - 28px); - overflow : hidden auto; + position: absolute; + top: 28px; + right: 0px; + z-index: 10000; + width: fit-content; + max-height: calc(100vh - 28px); + overflow: hidden auto; + display: flex; + flex-direction: column; + align-items: flex-end; .navItem { position : relative; display : flex; justify-content : space-between; align-items : center; width : 100%; + text-wrap : nowrap; border : 1px solid #888888; border-bottom : 0; animation-name : glideDropDown; From 7483b4afc6fa5c2f0dc276e17f0e793891e0aa37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 19:16:48 +0100 Subject: [PATCH 09/12] quickfix --- client/homebrew/navbar/navbar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 601310a71..9c153e381 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -244,7 +244,8 @@ top: 28px; right: 0px; z-index: 10000; - width: fit-content; + width: max-content; + min-width:100%; max-height: calc(100vh - 28px); overflow: hidden auto; display: flex; @@ -256,7 +257,6 @@ justify-content : space-between; align-items : center; width : 100%; - text-wrap : nowrap; border : 1px solid #888888; border-bottom : 0; animation-name : glideDropDown; From b2b276c3a3ad799d014f41b8ae658affd8cd7777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Wed, 6 Mar 2024 19:21:11 +0100 Subject: [PATCH 10/12] classname to new dropdown --- client/homebrew/navbar/newbrew.navitem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 319ef3392..4a1c3424a 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -33,7 +33,7 @@ const NewBrew = () => { }; return ( - + Date: Wed, 6 Mar 2024 19:43:44 +0100 Subject: [PATCH 11/12] dropdown classes fix --- client/homebrew/navbar/account.navitem.jsx | 2 +- client/homebrew/navbar/help.navitem.jsx | 2 +- client/homebrew/navbar/newbrew.navitem.jsx | 2 +- client/homebrew/navbar/recent.navitem.jsx | 2 +- client/homebrew/pages/editPage/editPage.jsx | 4 ++-- client/homebrew/pages/sharePage/sharePage.jsx | 2 +- shared/naturalcrit/nav/nav.jsx | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx index b3b6d06b0..6b412c368 100644 --- a/client/homebrew/navbar/account.navitem.jsx +++ b/client/homebrew/navbar/account.navitem.jsx @@ -61,7 +61,7 @@ const Account = createClass({ render : function(){ // Logged in if(global.account){ - return + return + return need help? diff --git a/client/homebrew/navbar/newbrew.navitem.jsx b/client/homebrew/navbar/newbrew.navitem.jsx index 4a1c3424a..319ef3392 100644 --- a/client/homebrew/navbar/newbrew.navitem.jsx +++ b/client/homebrew/navbar/newbrew.navitem.jsx @@ -33,7 +33,7 @@ const NewBrew = () => { }; return ( - + + return {this.props.text} diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 3329d1ba6..5ed13012a 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -355,14 +355,14 @@ const EditPage = createClass({ {this.renderGoogleDriveIcon()} {this.state.error ? : - + {this.renderSaveButton()} {this.renderAutoSaveButton()} } - + share diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index c8fad41c4..981ad0126 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -60,7 +60,7 @@ const SharePage = createClass({ {this.props.brew.shareId && <> - + source diff --git a/shared/naturalcrit/nav/nav.jsx b/shared/naturalcrit/nav/nav.jsx index 04b7037dd..fb77780c0 100644 --- a/shared/naturalcrit/nav/nav.jsx +++ b/shared/naturalcrit/nav/nav.jsx @@ -104,7 +104,7 @@ const Nav = { }); return ( -
handleDropdown(true) : undefined } onMouseLeave = { props.trigger.includes('hover') ? ()=>handleDropdown(false) : undefined } From 58422569c9d0a33d99f6d62c48cb06f37f0483a1 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Wed, 6 Mar 2024 15:32:38 -0500 Subject: [PATCH 12/12] Extra classes were needed for .recent and .save .save has special styling for the "on" button. .recent has special styling for the dividers between Edited and Viewed --- client/homebrew/navbar/navbar.less | 3 ++- client/homebrew/navbar/recent.navitem.jsx | 2 +- client/homebrew/pages/editPage/editPage.jsx | 2 +- shared/naturalcrit/nav/nav.jsx | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index 9c153e381..d0f2f77e8 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -271,7 +271,8 @@ position : relative; box-sizing : border-box; display : block; - max-height : ~'calc(100vh - 28px)'; + max-width : 15em; + max-height : ~'calc(100vh - 28px)'; padding : 8px 5px 13px; overflow : hidden auto; color : white; diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx index d57a636f9..431bdd8df 100644 --- a/client/homebrew/navbar/recent.navitem.jsx +++ b/client/homebrew/navbar/recent.navitem.jsx @@ -165,7 +165,7 @@ const RecentItems = createClass({ }, render : function(){ - return + return {this.props.text} diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 5ed13012a..d5af310b5 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -355,7 +355,7 @@ const EditPage = createClass({ {this.renderGoogleDriveIcon()} {this.state.error ? : - + {this.renderSaveButton()} {this.renderAutoSaveButton()} diff --git a/shared/naturalcrit/nav/nav.jsx b/shared/naturalcrit/nav/nav.jsx index fb77780c0..beb3d9cc4 100644 --- a/shared/naturalcrit/nav/nav.jsx +++ b/shared/naturalcrit/nav/nav.jsx @@ -104,7 +104,7 @@ const Nav = { }); return ( -
handleDropdown(true) : undefined } onMouseLeave = { props.trigger.includes('hover') ? ()=>handleDropdown(false) : undefined }