diff --git a/client/homebrew/navbar/account.navitem.jsx b/client/homebrew/navbar/account.navitem.jsx
index 6bfa89484..a9f3202bd 100644
--- a/client/homebrew/navbar/account.navitem.jsx
+++ b/client/homebrew/navbar/account.navitem.jsx
@@ -62,13 +62,6 @@ const Account = createReactClass({
// Logged in
if(global.account){
return
-
- {global.account.username}
-
;
},
- item : ({ icon, href, newTab, onClick, color, children, className, disabled, ...props })=>{
+ item : ({ icon, kbd,href, newTab, onClick, color, children, className, disabled, ...props })=>{
const classes = cx('navItem', color, className);
if(disabled) {
return
@@ -39,6 +39,7 @@ const Nav = {
return ;
}
},
diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx
index 8cc49990a..345dd7788 100644
--- a/client/homebrew/navbar/navbar.jsx
+++ b/client/homebrew/navbar/navbar.jsx
@@ -14,6 +14,9 @@ import Nav from './nav.jsx';
const Navbar = ({ account, brew, title, props }) => {
const version = global.version || '0.0.0';
+ const isMac = navigator.platform.toUpperCase().includes("MAC");
+ const mod = isMac ? "⌘" : "Ctrl";
+
const renderTitle = () => {
//if vault
const cleanTitle = title.replace(/^\/+|\/+$/g, '');
@@ -59,13 +62,12 @@ const Navbar = ({ account, brew, title, props }) => {
Edit>} icon={null} key={'edit'}>
-
Undo
- Redo
- Cut
- Copy
- Paste
- Find
- Find and Replace
+ Undo
+ Redo
+ cut
+ copy
+ paste
+ Find / Replace
Go>} icon={null} key={'go'}>
diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less
index 45237c4a8..a4fd4f972 100644
--- a/client/homebrew/navbar/navbar.less
+++ b/client/homebrew/navbar/navbar.less
@@ -299,7 +299,7 @@
place-items: center;
height: 100%;
width: 100%;
- padding: 5px;
+ padding: 5px 10px;
}
a {
color: inherit;
@@ -309,11 +309,32 @@
&:hover {
background:#555;
}
+ &:has(> i, > kbd) {
+ display:flex;
+ gap:5px;
+ justify-content: space-between;
+ }
+
+ kbd {
+ font-size:.8em;
+ font-family: monospace;
+ color:#aaa;
+ background:#222;
+ padding:2px 5px;
+ border-radius:5px;
+ }
+ }
+
+ .navItem {
+ height:2em;
+
+ &.header {
+ justify-content: center;
+ }
}
> ul {
display: flex;
- gap: 15px;
align-items: center;
height: 100%;
@@ -321,14 +342,11 @@
height: 100%;
text-wrap:nowrap;
- &:not(:only-child) {
-
- &:first-child {
- padding-left: 10px;
- }
- &:last-child {
- padding-right: 10px;
+ &:first-child :is(button, a) {
+ padding-left: 15px;
}
+ &:last-child :is(button, a) {
+ padding-right: 15px;
}
}
}
diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx
index c4d3b9181..e08858e6e 100644
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -143,13 +143,15 @@ const RecentItems = createReactClass({
// if(!this.state.showDropdown) return null;
const makeItems = (brews)=>{
- return _.map(brews, (brew, i)=>{
- return
- {brew.title || '[ no title ]'}
- {Moment(brew.ts).fromNow()}
- {this.removeItem(`${brew.url}`, e);}}>
- ;
- });
+ return
};
return <>
@@ -166,9 +168,6 @@ const RecentItems = createReactClass({
render : function(){
return
-
- {this.props.text}
-
{this.renderDropdown()}
;
}