mirror of
https://github.com/streetwriters/notesnook.git
synced 2026-09-01 19:49:54 +02:00
web: integrate the tab bar like before
This commit is contained in:
committed by
Abdullah Atta
parent
0517f61164
commit
38c6dd3953
@@ -136,7 +136,7 @@ function DesktopAppContents({
|
||||
|
||||
return (
|
||||
<>
|
||||
<EditorActionBar />
|
||||
{IS_DESKTOP_APP ? <EditorActionBar /> : null}
|
||||
<Flex
|
||||
variant="rowFill"
|
||||
sx={{
|
||||
|
||||
@@ -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) => (
|
||||
|
||||
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user