diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index 5e1605c4e..8d21d987b 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -41,7 +41,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) File} icon={null} key={'file'}> - +
diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index dafde1024..b9a590ad8 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -200,6 +200,10 @@ left:unset; right:5px; } + &.fa-times { + position:relative; + left:unset; + } } &.header { @@ -228,7 +232,8 @@ } } .clear { - width: 55px; + align-items: center; + width: 50px; padding: 0; cursor: pointer; transition: background-color @defaultDuration; @@ -296,9 +301,6 @@ min-height: 2.2em; padding-left: 25px; - &:last-child { - padding-bottom: 10px; - } &.save { width: 100%; } @@ -309,6 +311,13 @@ } } + >.navItem:last-child, .nav-section:last-child .navItem:last-child { + padding-bottom: 10px; + } + .nav-section:has(+ .header) { + padding-bottom:5px; + } + .nav-section:not(:last-child, :has(+ .header)) { border-bottom: 1px solid; padding-bottom: 5px; diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx index 1ecec66a0..121c6a335 100644 --- a/client/homebrew/navbar/recent.navitem.jsx +++ b/client/homebrew/navbar/recent.navitem.jsx @@ -13,7 +13,7 @@ const RecentItems = createReactClass({ DisplayName : 'RecentItems', getDefaultProps : function() { return { - storageKey : '', + pageName : '', showEdit : false, showView : false }; @@ -33,8 +33,8 @@ const RecentItems = createReactClass({ let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]'); let viewed = JSON.parse(localStorage.getItem(VIEW_KEY) || '[]'); - //== Add current brew to appropriate recent items list (depending on storageKey) ==// - if(this.props.storageKey == 'edit'){ + //== Add current brew to appropriate recent items list (depending on pageName) ==// + if(this.props.pageName == 'editPage'){ let editId = this.props.brew.editId; if(this.props.brew.googleId && !this.props.brew.stubbed){ editId = `${this.props.brew.googleId}${this.props.brew.editId}`; @@ -49,7 +49,7 @@ const RecentItems = createReactClass({ ts : Date.now() }); } - if(this.props.storageKey == 'view'){ + if(this.props.pageName == 'sharePage'){ let shareId = this.props.brew.shareId; if(this.props.brew.googleId && !this.props.brew.stubbed){ shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`; @@ -81,7 +81,7 @@ const RecentItems = createReactClass({ componentDidUpdate : function(prevProps) { if(prevProps.brew && this.props.brew.editId !== prevProps.brew.editId) { let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]'); - if(this.props.storageKey == 'edit') { + if(this.props.pageName == 'editPage') { let prevEditId = prevProps.brew.editId; if(prevProps.brew.googleId && !this.props.brew.stubbed){ prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`; @@ -177,7 +177,7 @@ export default { edited : (props)=>{ return ; @@ -186,7 +186,7 @@ export default { viewed : (props)=>{ return ; @@ -195,7 +195,7 @@ export default { both : (props)=>{ return