Skip to content

Build your personal knowledge base with Trilium Notes

refactor(client): style both layouts with the new layout's rules

Elian Dorana9afe3e46c4c
diff --git a/apps/client/src/stylesheets/theme-next/pages.css b/apps/client/src/stylesheets/theme-next/pages.css
index 87f8f6abb0..41ea3e8d9f 100644
--- a/apps/client/src/stylesheets/theme-next/pages.css
+++ b/apps/client/src/stylesheets/theme-next/pages.css
@@ -150,10 +150,6 @@
height: 0;
}
-body.experimental-feature-new-layout .note-detail-content-widget-content.options {
- padding-inline: 25px;
-}
-
/* Every top-level block of an options page is a section of it; only the header spans the full pane. */
.note-detail-content-widget-content.options > *:not(.options-page-header) {
margin-bottom: 26px;
@@ -185,6 +181,7 @@ body.desktop .options-section:not(.tn-no-card) {
--default-padding: 15px;
padding-top: var(--default-padding);
padding-bottom: var(--default-padding);
+ padding-inline: 25px;
}
.options-section h4 {
diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css
index ecfe02f93b..7963b7f653 100644
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -1350,7 +1350,7 @@ body.desktop .title-row {
#center-pane .note-split > div.alert {
position: relative;
- margin: 8px 0 0 0;
+ margin: 0;
border: unset;
border-radius: 0;
padding: 8px 16px;
@@ -1361,10 +1361,6 @@ body.desktop .title-row {
border-bottom: 2px solid #0000001c !important;
}
-body.experimental-feature-new-layout #center-pane .note-split > div.alert {
- margin-top: 0;
-}
-
/*
* Promoted attributes
*/
@@ -1601,7 +1597,7 @@ div.find-replace-widget div.find-widget-found-wrapper > span {
background: var(--right-pane-background-color);
}
-/* New layout: status bar delimiter */
+/* Status bar delimiter */
body.desktop .vertical-layout #right-pane {
border-bottom: 1px solid var(--status-bar-border-color);
}
diff --git a/apps/client/src/stylesheets/tree.css b/apps/client/src/stylesheets/tree.css
index 6c9c4faeeb..fed51e7cd7 100644
--- a/apps/client/src/stylesheets/tree.css
+++ b/apps/client/src/stylesheets/tree.css
@@ -171,18 +171,14 @@ span.fancytree-node.protected > span.fancytree-custom-icon {
}
.note-indicator-icon.clone-indicator::before {
- content: "\eb3d"; /* bx-link-alt */
+ content: "\ed82";
+ opacity: 0.5;
}
.note-indicator-icon.shared-indicator::before {
content: "\ec03"; /* bx-share-alt */
}
-body.experimental-feature-new-layout .note-indicator-icon.clone-indicator::before {
- content: "\ed82";
- opacity: 0.5;
-}
-
span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-title {
font-weight: bold;
}
diff --git a/apps/client/src/widgets/dialogs/OptionsDialog.css b/apps/client/src/widgets/dialogs/OptionsDialog.css
index a69a883559..614d4d8dd6 100644
--- a/apps/client/src/widgets/dialogs/OptionsDialog.css
+++ b/apps/client/src/widgets/dialogs/OptionsDialog.css
@@ -135,8 +135,7 @@ body.mobile .modal.options-dialog.mobile-master-detail {
}
}
- /* Held to the same margin whatever the page: its own is a desktop measure, and in the old
- layout it has none of its own at all. */
+ /* Held to the same margin whatever the page: its own is a desktop measure. */
.note-detail-content-widget-content.options {
padding-left: var(--options-pane-inset-left);
padding-right: var(--options-pane-inset-right);
diff --git a/apps/client/src/widgets/type_widgets/mind_map/NodePanel.css b/apps/client/src/widgets/type_widgets/mind_map/NodePanel.css
index 81b382017c..945b95a2d3 100644
--- a/apps/client/src/widgets/type_widgets/mind_map/NodePanel.css
+++ b/apps/client/src/widgets/type_widgets/mind_map/NodePanel.css
@@ -1,8 +1,7 @@
.mind-map-node-panel {
- /* Below the floating buttons of the note, which stand in this corner. */
- --node-panel-top: 60px;
+ --node-panel-top: var(--mind-map-inset-top);
/*
- * And above the map's toolbar, which stands in the corner under it, inset as far from the edge
+ * Above the map's toolbar, which stands in the corner under it, inset as far from the edge
* as the panel is (see MapToolbar.css). The panel is drawn over it, so a panel that reached the
* foot of the map would take the top half of every one of those buttons with it — the clicks
* along with the sight of them. What is kept is the bar's own room and as much again over it.
@@ -18,19 +17,6 @@
max-height: calc(100% - var(--node-panel-top) - var(--node-panel-foot));
}
-/* On a screen of its own the panel starts where the map does, there being no note buttons over it
- there. The room it leaves for the toolbar follows the foot of the map on its own, both being
- reckoned from the same insets (see MindMap.css). */
-.mind-map-container:fullscreen .mind-map-node-panel {
- --node-panel-top: var(--mind-map-inset-top);
-}
-
-/* The new layout keeps no floating buttons over that corner — what they did is done from the title
- row above the note instead — so there is nothing there for the panel to start under. */
-body.experimental-feature-new-layout .mind-map-node-panel {
- --node-panel-top: var(--mind-map-inset-top);
-}
-
/*
* The memo is the whole of its tab, so it fills the height the panel took from the fields — and the
* width edge to edge, the tab keeping none of the padding for itself. What insets the writing is
diff --git a/apps/client/src/widgets/type_widgets/options/components/OptionsPageHeader.css b/apps/client/src/widgets/type_widgets/options/components/OptionsPageHeader.css
index 136ae0b368..d744f024ae 100644
--- a/apps/client/src/widgets/type_widgets/options/components/OptionsPageHeader.css
+++ b/apps/client/src/widgets/type_widgets/options/components/OptionsPageHeader.css
@@ -86,10 +86,8 @@
padding-block: 10px;
}
-/* Break out of the option page's inline padding (25px in the new layout) so the bar — and its bottom
- border — spans the full content width; re-add the inset as padding so the title and actions still
- line up with the option cards. */
-body.experimental-feature-new-layout .options-page-header {
+/* Matches the options page's inline padding in pages.css. */
+.options-page-header {
margin-inline: -25px;
padding-inline: 25px;
}