diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 782263ad2..55c6043f8 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -81,8 +81,8 @@ const Homebrew = (props)=>{ } /> }/> } /> - } /> - } /> + } /> + } /> } /> } /> } /> diff --git a/client/homebrew/navbar/nav.jsx b/client/homebrew/navbar/nav.jsx index f0f26a6b1..d88321cc1 100644 --- a/client/homebrew/navbar/nav.jsx +++ b/client/homebrew/navbar/nav.jsx @@ -44,9 +44,9 @@ const Nav = { } }, header: ({span, className, children, ...props})=>{ - return
  • + return {children} -
  • ; + ; }, }; diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index 17e18e444..82484a0fc 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -18,7 +18,6 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) const mod = isMac ? '⌘' : 'Ctrl'; const isBrew = !!brew && (brew.shareId || pageName === 'homePage' || pageName === 'newPage'); const account = global.account; - const generalPage = pageName === 'vaultPage' || pageName === 'changelog' || pageName === 'faq' || pageName === 'migrate'; const navSlots = React.Children.toArray(children).reduce((slots, child) => { if (!React.isValidElement(child)) return slots; @@ -162,7 +161,7 @@ const Navbar = ({ children, brew, pageName, editor, title, currentPage, props }) {navSlots.menu} - {generalPage && {title}} + {pageName !== 'sharePage' && {title}}
      {account.username}} icon={null} key={account.username}> diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index b2fb79f00..9dac5fd79 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -31,17 +31,19 @@ padding: 0; } &.brewTitle { - display: block; width: 100%; + max-width: none; overflow: hidden; text-overflow: ellipsis; - font-size: 12px; - font-weight: 800; color: white; text-align: center; text-transform: initial; white-space: nowrap; - background-color: transparent; + letter-spacing: 1px; + + @media screen and (max-width: 800px) { + display: none; + } } &.metadata { position: relative; @@ -184,6 +186,10 @@ height: 100%; width: 100%; padding: 5px 10px; + + @media screen and (max-width: 800px) { + padding: 5px; + } } a { color: inherit; @@ -204,7 +210,7 @@ &:has(ul):not(:has(ul :is(button, a):not(:disabled))) { color: grey; //faux disabled if all buttons are disabled } - &:hover { + &:not(.header):hover { background: #484848; } &:has(> i, > kbd, > img) { @@ -221,6 +227,9 @@ padding: 2px 5px; border-radius: 5px; } + &.header { + cursor: default; + } &.recent ul { position: relative; @@ -230,6 +239,19 @@ gap: 5px; height: 2.7em; isolation: isolate; + + &.header { + display: block; + padding: 5px 0; + color: #bbbbbb; + border-top: 1px solid #888888; + &:nth-of-type(1) { + background-color: darken(@teal, 20%); + } + &:nth-of-type(2) { + background-color: darken(@purple, 30%); + } + } .clear { width: 55px; padding: 0; @@ -253,21 +275,6 @@ color: #888888; z-index: -1; } - &.header { - box-sizing: border-box; - display: block; - padding: 5px 0; - color: #bbbbbb; - text-align: center; - background-color: #333333; - border-top: 1px solid #888888; - &:nth-of-type(1) { - background-color: darken(@teal, 20%); - } - &:nth-of-type(2) { - background-color: darken(@purple, 30%); - } - } } } diff --git a/client/homebrew/pages/basePages/editPage/editorPage.jsx b/client/homebrew/pages/basePages/editorPage/editorPage.jsx similarity index 99% rename from client/homebrew/pages/basePages/editPage/editorPage.jsx rename to client/homebrew/pages/basePages/editorPage/editorPage.jsx index c881ce873..4189cd09d 100644 --- a/client/homebrew/pages/basePages/editPage/editorPage.jsx +++ b/client/homebrew/pages/basePages/editorPage/editorPage.jsx @@ -39,6 +39,7 @@ const EditorPage = (props)=>{ save, onSaveSuccess, pageName, + pageTitle, showEditorButtons, userThemes = {} } = props; @@ -375,7 +376,7 @@ const EditorPage = (props)=>{
      {(pageName == 'editPage') && } - + - +
      {this.props.children}
      diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index c96ca877c..919d01f0e 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -1,7 +1,7 @@ import React from 'react'; import request from '../../utils/request-middleware.js'; import _ from 'lodash'; -import EditorPage from '../basePages/editPage/editorPage.jsx'; +import EditorPage from '../basePages/editorPage/editorPage.jsx'; import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefaults.js'; // Page specific imports @@ -49,6 +49,7 @@ const EditPage = (props)=>{ showFloatingButtons = {false} showEditorButtons = {true} pageName = {'editPage'} + pageTitle = {props.brew.title} brew = {props.brew} userThemes = {props.userThemes} save = {save} diff --git a/client/homebrew/pages/errorPage/errorPage.jsx b/client/homebrew/pages/errorPage/errorPage.jsx index 3a527a201..9c11d89cd 100644 --- a/client/homebrew/pages/errorPage/errorPage.jsx +++ b/client/homebrew/pages/errorPage/errorPage.jsx @@ -9,7 +9,7 @@ const ErrorPage = ({ brew })=>{ const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || ''; return ( - +

      {`Error ${brew?.status || '000'}`}

      diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index ef1957d9f..f26daaa82 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -3,7 +3,7 @@ import './homePage.less'; import React from 'react'; import request from '../../utils/request-middleware.js'; import _ from 'lodash'; -import EditorPage from '../basePages/editPage/editorPage.jsx'; +import EditorPage from '../basePages/editorPage/editorPage.jsx'; import { DEFAULT_BREW } from '../../../../server/brewDefaults.js'; const HomePage =(props)=>{ @@ -32,6 +32,7 @@ const HomePage =(props)=>{ showFloatingButtons = {true} showEditorButtons = {false} pageName = {'homePage'} + pageTitle = {'The Homebrewery'} brew = {props.brew} userThemes = {{}} save = {save} diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 4eae606d3..b199ffdec 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -1,7 +1,7 @@ import React from 'react'; import request from '../../utils/request-middleware.js'; import _ from 'lodash'; -import EditorPage from '../basePages/editPage/editorPage.jsx'; +import EditorPage from '../basePages/editorPage/editorPage.jsx'; import { DEFAULT_BREW } from '../../../../server/brewDefaults.js'; const NewPage = (props)=>{ @@ -30,6 +30,7 @@ const NewPage = (props)=>{ showFloatingButtons = {false} showEditorButtons = {true} pageName = {'newPage'} + pageTitle = {'Sandbox'} brew = {props.brew} userThemes = {props.userThemes} save = {save} diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index f5ba590cd..39ff3f0a0 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -34,7 +34,7 @@ const UserPage = (props)=>{ }; return ( - setError(err)} /> + setError(err)} /> ); };