Skip to content

Build your personal knowledge base with Trilium Notes

refactor(client): show the status bar on the old layout

Elian Doranb7ffe6c992f6
diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index d5fa883701..9396ece759 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -169,10 +169,10 @@ export default class DesktopLayout {
)
.child(<RightPanelContainer widgetsByParent={this.customWidgets} />)
)
- .optChild(!launcherPaneIsHorizontal && isNewLayout, <StatusBar />)
+ .optChild(!launcherPaneIsHorizontal, <StatusBar />)
)
)
- .optChild(launcherPaneIsHorizontal && isNewLayout, <StatusBar />)
+ .optChild(launcherPaneIsHorizontal, <StatusBar />)
.child(<CloseZenModeButton />)
// Desktop-specific dialogs.
diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css
index 088a3569ab..48104c99c1 100644
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -153,18 +153,12 @@ body.desktop {
}
}
- &.experimental-feature-new-layout #root-widget.horizontal-layout {
+ #root-widget.horizontal-layout {
>.status-bar {
padding-bottom: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
}
}
- &:not(.experimental-feature-new-layout) #root-widget.horizontal-layout {
- #horizontal-main-container {
- padding-bottom: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
- }
- }
-
.modal .modal-dialog {
margin-top: calc(var(--safe-area-inset-top, env(safe-area-inset-top)) + var(--bs-modal-margin));
}
diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css
index aa86bd4125..86af3e9939 100644
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -128,7 +128,7 @@ body.background-effects.theme-supports-background-effects #center-pane .note-spl
}
/* Matches when a status bar panel is open */
-body.experimental-feature-new-layout #horizontal-main-container:has(#rest-pane > .status-bar.status-bar-panel-open) {
+#horizontal-main-container:has(#rest-pane > .status-bar.status-bar-panel-open) {
--note-split-bottom-border-radius: 0;
}
@@ -1247,7 +1247,7 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
*/
/* Note split */
- body.desktop.experimental-feature-new-layout .vertical-layout #center-pane .note-split {
+ body.desktop .vertical-layout #center-pane .note-split {
border-bottom: 1px solid var(--status-bar-border-color);
}
@@ -1255,7 +1255,7 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
.vertical-layout #center-pane .note-split:not(.visible ~ .visible) {
border-start-start-radius: var(--note-split-top-border-radius);
- body.desktop.experimental-feature-new-layout & {
+ body.desktop & {
border-end-start-radius: var(--note-split-bottom-border-radius);
> .scrolling-container {
@@ -1846,7 +1846,7 @@ div.find-replace-widget div.find-widget-found-wrapper > span {
}
/* New layout: status bar delimiter */
-body.desktop.experimental-feature-new-layout .vertical-layout #right-pane {
+body.desktop .vertical-layout #right-pane {
border-bottom: 1px solid var(--status-bar-border-color);
}
diff --git a/apps/client/src/widgets/layout/StatusBar.css b/apps/client/src/widgets/layout/StatusBar.css
index a5d4f1f8d6..75e3e3aea6 100644
--- a/apps/client/src/widgets/layout/StatusBar.css
+++ b/apps/client/src/widgets/layout/StatusBar.css
@@ -137,7 +137,7 @@
}
}
-body.experimental-feature-new-layout .note-info-content {
+.note-info-content {
ul {
--row-block-margin: .2em;
diff --git a/apps/client/src/widgets/sidebar/RightPanePeekButton.css b/apps/client/src/widgets/sidebar/RightPanePeekButton.css
index 1069021ac9..59d5951554 100644
--- a/apps/client/src/widgets/sidebar/RightPanePeekButton.css
+++ b/apps/client/src/widgets/sidebar/RightPanePeekButton.css
@@ -37,7 +37,7 @@ body.desktop.background-effects #center-pane:has(.note-split.last-visible.bgfx)
color: var(--peek-button-arrow-color);
transition: background 250ms ease-in, color 250ms ease-in;
- body.experimental-feature-new-layout.layout-vertical & {
+ body.layout-vertical & {
border-bottom: 1px solid var(--status-bar-border-color);
}