From 4473f80d733197456529044ce0853841776b5b95 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 13 Dec 2025 12:02:17 +0200 Subject: [PATCH] refactor(layout): remove floating title bar experiment --- apps/client/src/layouts/desktop_layout.tsx | 1 - .../src/services/experimental_features.ts | 5 --- .../src/translations/en/translation.json | 4 +-- apps/client/src/widgets/note_title.css | 32 ------------------- 4 files changed, 1 insertion(+), 41 deletions(-) diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx index 86b7ee48e..2aa7c030a 100644 --- a/apps/client/src/layouts/desktop_layout.tsx +++ b/apps/client/src/layouts/desktop_layout.tsx @@ -79,7 +79,6 @@ export default class DesktopLayout { const fullWidthTabBar = launcherPaneIsHorizontal || (isElectron && !hasNativeTitleBar && isMac); const customTitleBarButtons = !hasNativeTitleBar && !isMac && !isWindows; const isNewLayout = isExperimentalFeatureEnabled("new-layout"); - const isFloatingTitlebar = isExperimentalFeatureEnabled("floating-titlebar"); const titleRow = new FlexContainer("row") .class("title-row") diff --git a/apps/client/src/services/experimental_features.ts b/apps/client/src/services/experimental_features.ts index 6e2f14e86..398467410 100644 --- a/apps/client/src/services/experimental_features.ts +++ b/apps/client/src/services/experimental_features.ts @@ -12,11 +12,6 @@ export const experimentalFeatures = [ id: "new-layout", name: t("experimental_features.new_layout_name"), description: t("experimental_features.new_layout_description"), - }, - { - id: "floating-titlebar", - name: t("experimental_features.floating_titlebar"), - description: t("experimental_features.floating_titlebar_description"), } ] as const satisfies ExperimentalFeature[]; diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json index 17b1b90ae..0f5e2be95 100644 --- a/apps/client/src/translations/en/translation.json +++ b/apps/client/src/translations/en/translation.json @@ -1102,9 +1102,7 @@ "title": "Experimental Options", "disclaimer": "These options are experimental and may cause instability. Use with caution.", "new_layout_name": "New Layout", - "new_layout_description": "Try out the new layout for a more modern look and improved usability. Subject to heavy change in the upcoming releases.", - "floating_titlebar": "Floating Titlebar", - "floating_titlebar_description": "The title bar is part of the content and is scrolled along with the note content." + "new_layout_description": "Try out the new layout for a more modern look and improved usability. Subject to heavy change in the upcoming releases." }, "fonts": { "theme_defined": "Theme defined", diff --git a/apps/client/src/widgets/note_title.css b/apps/client/src/widgets/note_title.css index c928a21b1..4f8176a1d 100644 --- a/apps/client/src/widgets/note_title.css +++ b/apps/client/src/widgets/note_title.css @@ -60,35 +60,3 @@ body.experimental-feature-new-layout { } } } - -body.experimental-feature-floating-titlebar { - .title-row { - max-width: var(--max-content-width); - padding: 0; - padding-inline-start: 24px; - } - - .note-icon-widget { - padding: 0; - width: 41px; - } - - .note-split.type-code:not(.mime-text-x-sqlite) .title-row { - background-color: var(--main-background-color); - } - - .scrolling-container:has(> :is(.note-detail.full-height, .note-list-widget.full-height)), - .note-split.type-book { - .title-row { - width: 100%; - max-width: unset; - padding-inline-start: 15px; - padding-bottom: 0.2em; - font-size: 0.8em; - } - } - - &.prefers-centered-content .title-row { - margin-inline: auto; - } -}