Skip to content

Build your personal knowledge base with Trilium Notes

refactor(client): style the note title like the new layout on both layouts

Elian Doran94c2bf6f2ccb
diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index 3eed1971dc..7307edcaa7 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -134,7 +134,7 @@ export default class DesktopLayout {
.child(
new ScrollingContainer()
.filling()
- .optChild(isNewLayout, <InlineTitle />)
+ .child(<InlineTitle />)
.child(<NoteTitleActions />)
.child(<NoteDetail />)
.child(<NoteList media="screen" />)
diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css
index 6eef158cd7..d57fd96707 100644
--- a/apps/client/src/stylesheets/theme-next/shell.css
+++ b/apps/client/src/stylesheets/theme-next/shell.css
@@ -1314,20 +1314,8 @@ body.desktop .title-row {
/* The "Change note icon" button */
-:root .note-icon-widget button.note-icon,
-:root .note-icon-widget button.note-icon:hover {
+:root .note-icon-widget button.note-icon {
border: none;
- border-radius: 8px;
-}
-
-/* Dropdown open */
-:root .note-icon-widget button.note-icon.show {
- background: var(--ck-editor-toolbar-dropdown-button-open-background);
-}
-
-:root .note-icon-widget button.note-icon:not(:disabled):hover {
- background: var(--icon-button-hover-background);
- color: var(--icon-button-hover-color);
}
.note-actions {
diff --git a/apps/client/src/widgets/note_icon.css b/apps/client/src/widgets/note_icon.css
index 3629dd3342..eb3471a245 100644
--- a/apps/client/src/widgets/note_icon.css
+++ b/apps/client/src/widgets/note_icon.css
@@ -48,41 +48,39 @@ div.note-icon-widget {
padding: 10px 15px 10px 15px !important;
}
-body.experimental-feature-new-layout {
- .note-icon-widget button.note-icon {
- --input-focus-outline-color: var(--note-icon-hover-background-color);
+.note-icon-widget button.note-icon {
+ --input-focus-outline-color: var(--note-icon-hover-background-color);
- position: relative;
- background: transparent !important;
+ position: relative;
+ background: transparent !important;
- &, &:hover {
- border-radius: 50%;
- }
+ &, &:hover {
+ border-radius: 50%;
+ }
- /* The icon */
- &::before {
- position: relative;
- z-index: 1;
- color: var(--note-icon-custom-color, var(--note-icon-color));
- }
+ /* The icon */
+ &::before {
+ position: relative;
+ z-index: 1;
+ color: var(--note-icon-custom-color, var(--note-icon-color));
+ }
- /* The background circle */
- &:not(.bx-empty:disabled)::after {
- content: "";
- position: absolute;
- inset: 0;
- border-radius: 50%;
- background: var(--note-icon-custom-background-color, var(--note-icon-background-color));
- }
+ /* The background circle */
+ &:not(.bx-empty:disabled)::after {
+ content: "";
+ position: absolute;
+ inset: 0;
+ border-radius: 50%;
+ background: var(--note-icon-custom-background-color, var(--note-icon-background-color));
+ }
- &:focus-visible {
- outline: 2px solid var(--note-icon-custom-color, var(--note-icon-color));
- }
+ &:focus-visible {
+ outline: 2px solid var(--note-icon-custom-color, var(--note-icon-color));
+ }
- &:hover:not(.bx-empty:disabled)::after {
- background: var(--note-icon-hover-custom-background-color, var(--note-icon-hover-background-color));
- transition: background 200ms ease-out;
- }
+ &:hover:not(.bx-empty:disabled)::after {
+ background: var(--note-icon-hover-custom-background-color, var(--note-icon-hover-background-color));
+ transition: background 200ms ease-out;
}
}
diff --git a/apps/client/src/widgets/note_title.css b/apps/client/src/widgets/note_title.css
index 0fac543430..76f6931f85 100644
--- a/apps/client/src/widgets/note_title.css
+++ b/apps/client/src/widgets/note_title.css
@@ -42,100 +42,98 @@ body.mobile .note-title-widget input.note-title {
border-bottom: 0 !important;
}
-body.experimental-feature-new-layout {
- .title-row {
- container-type: size;
- transition: border 400ms ease-out;
+.title-row {
+ container-type: size;
+ transition: border 400ms ease-out;
- &.note-split-title {
- border-bottom: 1px solid var(--main-border-color);
+ &.note-split-title {
+ border-bottom: 1px solid var(--main-border-color);
- &.hide-title {
- border-bottom-color: transparent;
- transition: none;
- }
-
- .note-icon-widget {
- margin-inline: 12px 8px;
- }
+ &.hide-title {
+ border-bottom-color: transparent;
+ transition: none;
}
.note-icon-widget {
- --note-icon-size: 16px;
- --note-icon-container-padding-size: 6px;
- margin-inline: 0;
+ margin-inline: 12px 8px;
}
+ }
+
+ .note-icon-widget {
+ --note-icon-size: 16px;
+ --note-icon-container-padding-size: 6px;
+ margin-inline: 0;
+ }
+
+ .note-title-widget {
+ --note-title-size: 18px;
+ --note-title-padding-inline: 0;
+ }
+ @container (max-width: 600px) {
.note-title-widget {
- --note-title-size: 18px;
- --note-title-padding-inline: 0;
+ --note-title-size: 1.25rem;
+ --note-title-padding-inline: 6px;
}
- @container (max-width: 600px) {
- .note-title-widget {
- --note-title-size: 1.25rem;
- --note-title-padding-inline: 6px;
+ .note-title-widget {
+ display: flex;
+ align-items: center;
+ .note-title {
+ font-size: 1em;
}
+ }
- .note-title-widget {
- display: flex;
- align-items: center;
- .note-title {
- font-size: 1em;
- }
- }
+ .note-title-widget:focus-within + .note-badges,
+ .ext-badge .text {
+ display: none;
+ }
- .note-title-widget:focus-within + .note-badges,
- .ext-badge .text {
- display: none;
- }
+ .ext-badge {
+ --size: 2em;
+ width: var(--size);
+ height: var(--size);
+ padding: 0;
- .ext-badge {
- --size: 2em;
- width: var(--size);
- height: var(--size);
- padding: 0;
-
- .tn-icon {
- opacity: 1;
- margin: 0;
- }
- };
- }
+ .tn-icon {
+ opacity: 1;
+ margin: 0;
+ }
+ };
}
+}
- .note-title-widget {
- input.note-title {
- --input-focus-background: transparent;
- --input-focus-outline-color: transparent;
- --input-hover-background: transparent;
- --input-hover-color: initial;
- --input-focus-color: initial;
- }
+.note-title-widget {
+ input.note-title {
+ --input-focus-background: transparent;
+ --input-focus-outline-color: transparent;
+ --input-hover-background: transparent;
+ --input-hover-color: initial;
+ --input-focus-color: initial;
}
+}
- &.mobile .title-row {
- .icon-action:not(.note-icon) {
- --icon-button-size: 45px;
- --icon-button-icon-ratio: 0.5;
- flex-shrink: 0;
- }
+body.mobile .title-row {
+ .icon-action:not(.note-icon) {
+ --icon-button-size: 45px;
+ --icon-button-icon-ratio: 0.5;
+ flex-shrink: 0;
+ }
- .note-actions {
- width: auto;
- }
+ .note-actions {
+ width: auto;
+ }
- .note-badges {
- margin-inline: 0.5em;
- flex-shrink: 0;
- }
+ .note-badges {
+ margin-inline: 0.5em;
+ flex-shrink: 0;
+ }
- .note-icon-widget {
- margin-inline: 0.5em;
+ .note-icon-widget {
+ margin-inline: 0.5em;
- .note-icon {
- --icon-button-size: 24px;
- }
+ .note-icon {
+ --icon-button-size: 24px;
}
}
}