From 24564a27509028c664cb06e6c873d20593217a19 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 15 Mar 2023 09:17:05 +1300 Subject: [PATCH] Shift to title wrapper --- client/homebrew/navbar/metadata.navitem.jsx | 21 +++++++++---------- client/homebrew/navbar/navbar.less | 12 +++++++++-- client/homebrew/pages/sharePage/sharePage.jsx | 7 ++++--- .../homebrew/pages/sharePage/sharePage.less | 4 ++++ shared/naturalcrit/nav/nav.jsx | 2 +- shared/naturalcrit/nav/nav.less | 2 +- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx index cfbbcbabe..09672c632 100644 --- a/client/homebrew/navbar/metadata.navitem.jsx +++ b/client/homebrew/navbar/metadata.navitem.jsx @@ -14,17 +14,17 @@ const MetadataNav = createClass({ getInitialState : function() { return { - showDropdown : false + showMetaWindow : false }; }, componentDidMount : function() { }, - handleDropdown : function(show){ - this.setState({ - showDropdown : show - }); + toggleMetaWindow : function(){ + this.setState((prevProps)=>({ + showMetaWindow : !prevProps.showMetaWindow + })); }, getAuthors : function(){ @@ -42,8 +42,8 @@ const MetadataNav = createClass({ return this.props.brew.systems.join(', '); }, - renderDropdown : function(){ - if(!this.state.showDropdown) return null; + renderMetaWindow : function(){ + if(!this.state.showMetaWindow) return null; return

Description

@@ -59,10 +59,9 @@ const MetadataNav = createClass({ render : function(){ return this.handleDropdown(true)} - onMouseLeave={()=>this.handleDropdown(false)}> - METADATA - {this.renderDropdown()} + onClick={()=>this.toggleMetaWindow()}> + {this.props.children} + {this.renderMetaWindow()} ; } diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index a4eb570f9..3aace3fbc 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -28,7 +28,7 @@ width : 250px; margin : 0; padding : 2px; - background-color : #444; + background-color : transparent; font-family : 'Open Sans', sans-serif; font-size : 12px; font-weight : 800; @@ -54,6 +54,7 @@ color : white; text-align : center; text-transform : initial; + flex-grow : 1; } .save-menu { .dropdown { @@ -165,12 +166,19 @@ } .metadata.navItem { position : relative; + padding: 0; + align-items: center; + display : flex; + flex-grow: 1; + i{ + margin-right: 10px; + } .dropdown{ position : absolute; top : 28px; left : 0px; z-index : 10000; - width : 350px; + width : 100%; max-height : ~"calc(100vh - 28px)"; background-color : #333; h4{ diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index a772197fb..8f67fda80 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -51,12 +51,13 @@ const SharePage = createClass({ return
- - {this.props.brew.title} + + + {this.props.brew.title} + - {this.props.brew.shareId && <> diff --git a/client/homebrew/pages/sharePage/sharePage.less b/client/homebrew/pages/sharePage/sharePage.less index 40b90496a..83e784c49 100644 --- a/client/homebrew/pages/sharePage/sharePage.less +++ b/client/homebrew/pages/sharePage/sharePage.less @@ -1,4 +1,8 @@ .sharePage{ + .navContent .navSection.titleSection { + flex-grow: 1; + justify-content: center; + } .content{ overflow-y : hidden; } diff --git a/shared/naturalcrit/nav/nav.jsx b/shared/naturalcrit/nav/nav.jsx index ef7d387e9..3272e5968 100644 --- a/shared/naturalcrit/nav/nav.jsx +++ b/shared/naturalcrit/nav/nav.jsx @@ -29,7 +29,7 @@ const Nav = { section : createClass({ displayName : 'Nav.section', render : function(){ - return
+ return
{this.props.children}
; } diff --git a/shared/naturalcrit/nav/nav.less b/shared/naturalcrit/nav/nav.less index 43eaa0819..697ab2cd9 100644 --- a/shared/naturalcrit/nav/nav.less +++ b/shared/naturalcrit/nav/nav.less @@ -54,7 +54,7 @@ nav{ .animate(background-color); padding : 8px 12px; cursor : pointer; - background-color : #333; + // background-color : #333; font-size : 10px; font-weight : 800; color : white;