Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

web: integrate the tab bar like before

Abdullah Atta38c6dd3953cc
diff --git a/apps/web/src/app.tsx b/apps/web/src/app.tsx
index f20cb124d..a92d395e7 100644
--- a/apps/web/src/app.tsx
+++ b/apps/web/src/app.tsx
@@ -136,7 +136,7 @@ function DesktopAppContents({
return (
<>
- <EditorActionBar />
+ {IS_DESKTOP_APP ? <EditorActionBar /> : null}
<Flex
variant="rowFill"
sx={{
diff --git a/apps/web/src/components/editor/action-bar.tsx b/apps/web/src/components/editor/action-bar.tsx
index c2626a53f..3f5d9c667 100644
--- a/apps/web/src/components/editor/action-bar.tsx
+++ b/apps/web/src/components/editor/action-bar.tsx
@@ -186,7 +186,7 @@ export function EditorActionBar() {
<Flex
sx={{
gap: 2,
- borderBottom: "1px solid var(--border)",
+ borderBottom: IS_DESKTOP_APP ? "1px solid var(--border)" : "none",
px: 1,
...(IS_DESKTOP_APP && !isFullscreen && hasNativeWindowControls
? getPlatform() === "darwin"
@@ -195,29 +195,24 @@ export function EditorActionBar() {
: {})
}}
>
- {IS_DESKTOP_APP ? (
- getPlatform() === "darwin" && !isFullscreen ? null : (
- <svg
- className="titlebarLogo"
- style={{
- alignSelf: "center",
- height: 24,
- width: 24
- }}
- >
- <use href="#themed-logo" />
- </svg>
- )
+ {IS_DESKTOP_APP && (getPlatform() !== "darwin" || isFullscreen) ? (
+ <svg
+ className="titlebarLogo"
+ style={{
+ alignSelf: "center",
+ height: 24,
+ width: 24
+ }}
+ >
+ <use href="#themed-logo" />
+ </svg>
) : null}
<TabStrip />
<Flex
bg="transparent"
sx={{
- // borderRadius: "default",
- // overflow: "hidden",
alignItems: "center",
justifyContent: "flex-end"
- // mr: IS_DESKTOP_APP ? `calc(100vw - env(titlebar-area-width))` : 2
}}
>
{tools.map((tool) => (
diff --git a/apps/web/src/components/editor/index.tsx b/apps/web/src/components/editor/index.tsx
index 0670ec1d2..65da3aa90 100644
--- a/apps/web/src/components/editor/index.tsx
+++ b/apps/web/src/components/editor/index.tsx
@@ -67,6 +67,7 @@ import TableOfContents from "./table-of-contents";
import { showNoteLinkingDialog } from "../../common/dialog-controller";
import { scrollIntoViewById } from "@notesnook/editor";
import { IEditor } from "./types";
+import { EditorActionBar } from "./action-bar";
const PDFPreview = React.lazy(() => import("../pdf-preview"));
@@ -90,6 +91,7 @@ export default function TabsView() {
return (
<>
+ {IS_DESKTOP_APP ? null : <EditorActionBar />}
<ScopedThemeProvider
scope="editor"
ref={dropRef}