Skip to content

Build your personal knowledge base with Trilium Notes

style(share): draw the app views' buttons as the app does

Elian Doranf83318234b97
diff --git a/apps/client/src/stylesheets/buttons.css b/apps/client/src/stylesheets/buttons.css
new file mode 100644
index 0000000000..00b69416ec
--- /dev/null
+++ b/apps/client/src/stylesheets/buttons.css
@@ -0,0 +1,36 @@
+.icon-action {
+ border: 1px solid transparent;
+ padding: 5px;
+ width: 37px;
+ height: 35px;
+ cursor: pointer;
+ font-size: 1.5em;
+ color: var(--button-text-color);
+ background: var(--button-background-color);
+ border-radius: var(--button-border-radius);
+}
+
+.icon-action-always-border {
+ border-color: var(--button-border-color);
+}
+
+.icon-action:hover:not(.disabled) {
+ text-decoration: none;
+ border-color: var(--button-border-color);
+}
+
+/* An action that takes something away, marked as such the way destructive menu items are. */
+.icon-action.destructive-action-icon {
+ color: var(--dropdown-item-icon-destructive-color);
+}
+
+.icon-action.disabled {
+ color: var(--muted-text-color) !important;
+ cursor: not-allowed;
+ pointer-events: none;
+}
+
+.icon-action.btn {
+ padding: 0 8px;
+ min-width: unset !important;
+}
diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css
index 184f99eb40..ba8ce28054 100644
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -1,6 +1,7 @@
@import "./boxicons-compat.css";
@import "./adaptive-colors.css";
@import "./menus.css";
+@import "./buttons.css";
@font-face {
font-family: Montserrat;
@@ -334,43 +335,6 @@ button.custom-title-bar-button {
overflow-x: hidden;
}
-.icon-action {
- border: 1px solid transparent;
- padding: 5px;
- width: 37px;
- height: 35px;
- cursor: pointer;
- font-size: 1.5em;
- color: var(--button-text-color);
- background: var(--button-background-color);
- border-radius: var(--button-border-radius);
-}
-
-.icon-action-always-border {
- border-color: var(--button-border-color);
-}
-
-.icon-action:hover:not(.disabled) {
- text-decoration: none;
- border-color: var(--button-border-color);
-}
-
-/* An action that takes something away, marked as such the way destructive menu items are. */
-.icon-action.destructive-action-icon {
- color: var(--dropdown-item-icon-destructive-color);
-}
-
-.icon-action.disabled {
- color: var(--muted-text-color) !important;
- cursor: not-allowed;
- pointer-events: none;
-}
-
-.icon-action.btn {
- padding: 0 8px;
- min-width: unset !important;
-}
-
.ui-widget-content a:not(.ui-tabs-anchor) {
color: #337ab7 !important;
}
diff --git a/apps/client/src/stylesheets/theme-next/buttons.css b/apps/client/src/stylesheets/theme-next/buttons.css
new file mode 100644
index 0000000000..64792cf4e6
--- /dev/null
+++ b/apps/client/src/stylesheets/theme-next/buttons.css
@@ -0,0 +1,263 @@
+/*
+ * Command buttons (.btn-primary / .btn-secondary / .btn-sm / .btn-success)
+ */
+
+button.btn.btn-primary,
+button.btn.btn-secondary,
+button.btn.btn-sm:not(.select-button),
+button.btn.btn-success,
+button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text,
+.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text,
+button.ck.ck-button.ck-ai-assistant-form__icon-action {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ min-width: 120px;
+ box-shadow: 1px 1px 1px var(--cmd-button-shadow-color);
+ border: unset;
+ border-radius: 6px;
+ padding: 4px 16px;
+ background: var(--cmd-button-background-color);
+ color: var(--cmd-button-text-color);
+
+ &.dropdown-toggle-split {
+ min-width: unset;
+ }
+}
+
+button.btn.btn-primary:hover,
+button.btn.btn-secondary:hover,
+button.btn.btn-sm:not(.select-button):hover,
+button.btn.btn-success:hover,
+button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):hover,
+.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text:not(.ck-disabled):hover,
+button.ck.ck-button.ck-ai-assistant-form__icon-action:not(.ck-disabled):hover {
+ background: var(--cmd-button-hover-background-color);
+ color: var(--cmd-button-hover-text-color);
+}
+
+button.btn.btn-primary:active,
+button.btn.btn-secondary:active,
+button.btn.btn-sm:not(.select-button):active,
+button.btn.btn-success:active,
+button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):active,
+.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text:not(.ck-disabled):active,
+button.ck.ck-button.ck-ai-assistant-form__icon-action:not(.ck-disabled):active {
+ opacity: 0.85;
+ box-shadow: unset;
+ background: var(--cmd-button-background-color) !important;
+ color: var(--cmd-button-text-color) !important;
+ transform: scale(0.95);
+}
+
+button.btn.btn-primary:disabled,
+button.btn.btn-secondary:disabled,
+button.btn.btn-sm:not(.select-button):disabled,
+button.btn.btn-success:disabled,
+button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text.ck-disabled,
+.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text.ck-disabled,
+button.ck.ck-button.ck-ai-assistant-form__icon-action.ck-disabled {
+ opacity: var(--cmd-button-disabled-opacity);
+}
+
+button.btn.btn-primary:focus-visible,
+button.btn.btn-secondary:focus-visible,
+button.btn.btn-sm:not(.select-button):focus-visible,
+button.btn.btn-success:focus-visible,
+button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):focus-visible,
+.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text:not(.ck-disabled):focus-visible,
+button.ck.ck-button.ck-ai-assistant-form__icon-action:not(.ck-disabled):focus-visible,
+.tn-focusable-button:focus-visible {
+ outline: 2px solid var(--input-focus-outline-color);
+}
+
+button.ck.ck-button.ck-ai-assistant-form__icon-action {
+ min-width: unset;
+ padding: 4px;
+}
+
+/* Button's icon. The text spacing is a margin rather than padding on purpose: transforms rotate the
+ padding-box, so with one-sided padding a spinning icon (`bx-spin`, e.g. a refresh button while
+ loading) orbits an off-center axis instead of rotating in place. Margin stays outside the
+ transformed box, keeping the spacing identical while the glyph spins about its own center. */
+button.btn.btn-primary span.tn-icon,
+button.btn.btn-secondary span.tn-icon,
+button.btn.btn-sm span.tn-icon,
+button.btn.btn-success span.tn-icon {
+ color: var(--cmd-button-icon-color);
+ margin-inline-end: 0.35em;
+ font-size: 1.2em;
+}
+
+/* An icon with no label beside it is the whole of the button, and the spacing above would only push
+ it off centre. A label is a text node, which no selector reaches, so the button says so itself
+ (see `tn-icon-only` in Button.tsx). Written after the rule it undoes, the two weighing the same. */
+button.btn.tn-icon-only span.tn-icon {
+ margin-inline-end: 0;
+}
+
+/* Button's keyboard shortcut */
+button.btn.btn-primary kbd,
+button.btn.btn-secondary kbd,
+button.btn.btn-sm kbd,
+button.btn.btn-success kbd {
+ margin-inline-start: 0.5em;
+ background: var(--cmd-button-keyboard-shortcut-background);
+ color: var(--cmd-button-keyboard-shortcut-color);
+ font-size: 0.6em;
+ text-transform: uppercase;
+ letter-spacing: 0.5pt;
+}
+
+/*
+ * Low profile buttons
+ */
+
+button.tn-low-profile {
+ appearance: none;
+ background: transparent;
+ border: 0;
+ border-radius: 8px;
+ color: inherit;
+}
+
+button.tn-low-profile:hover {
+ background-color: var(--icon-button-hover-background);
+}
+
+/*
+ * Icon buttons
+ */
+
+:root .icon-action:not(.global-menu-button),
+:root .tn-tool-button,
+:root .btn-group .tn-tool-button:not(:last-child),
+:root .btn-group .tn-tool-button:last-child {
+ width: var(--icon-button-size);
+ height: var(--icon-button-size);
+ border: unset !important;
+ border-radius: 8px;
+ padding: 0;
+ text-align: center;
+ color: var(--icon-button-color);
+}
+
+.btn-group .tn-tool-button + .tn-tool-button {
+ margin-inline-start: 4px !important;
+}
+
+/* An action that takes something away, marked as such the way destructive menu items are. Given as
+ the button's own colors rather than as a `color`, which the rules above and the hover one below
+ would both out-specify. */
+:root .icon-action.destructive-action-icon {
+ --icon-button-color: var(--dropdown-item-icon-destructive-color);
+ --icon-button-hover-color: var(--dropdown-item-icon-destructive-color);
+}
+
+/* The "x" icon button */
+:root .icon-action.bx-x,
+:root .tn-tool-button.bx-x {
+ --icon-button-hover-background: var(--tab-close-button-hover-background);
+ --icon-button-hover-color: var(--tab-close-button-hover-color);
+ --icon-button-size: 24px;
+ --icon-button-icon-ratio: 0.8;
+
+ border-radius: 50%;
+}
+
+/* The icon */
+:root .icon-action:not(.global-menu-button)::before,
+:root .tn-tool-button::before {
+ display: block;
+ line-height: 1;
+ font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio));
+}
+
+:root .icon-action.disabled::before {
+ opacity: .5;
+}
+
+:root .icon-action:not(.global-menu-button):hover,
+:root .icon-action:not(.global-menu-button).show,
+:root .tn-tool-button:hover,
+:root .tn-tool-button.show {
+ background: var(--icon-button-hover-background);
+ color: var(--icon-button-hover-color);
+}
+
+:root .icon-action:not(.global-menu-button):active::before,
+:root .tn-tool-button:active::before {
+ transform: scale(0.85);
+}
+
+:root .icon-action:not(.global-menu-button):focus-visible,
+:root .tn-tool-button:focus-visible {
+ outline: 2px solid var(--input-focus-outline-color);
+}
+
+/* Button groups */
+
+:root div.btn-group {
+ display: flex;
+ gap: 4px;
+ border-radius: 8px;
+ background: var(--button-group-background-color);
+ padding: 4px;
+
+ button,
+ button.btn,
+ button.btn.btn-secondary {
+ --cmd-button-background-color: transparent;
+ --cmd-button-shadow-color: transparent;
+
+ min-width: unset;
+ margin: 0;
+ box-shadow: unset;
+ border-radius: 8px;
+
+ &.active, &.active:hover {
+ background-color: var(--button-group-active-button-background-color);
+ color: var(--button-group-active-button-color);
+
+ box-shadow: 1px 1px 1px var(--button-group-active-button-shadow-color);
+ }
+ }
+
+ .icon-action {
+ --icon-button-size: 28px;
+ --icon-button-icon-ratio: .75;
+ width: calc(var(--icon-button-size) * 1.25);
+ }
+}
+
+:root .ck.ck-ai-assistant-form .ck-ai-assistant-form__viewmodes {
+ gap: 4px;
+ border-radius: 8px;
+ background: var(--button-group-background-color);
+ padding: 4px;
+
+ button.ck.ck-button {
+ min-width: unset;
+ margin: 0;
+ box-shadow: unset;
+ border-radius: 8px;
+ background: transparent;
+ border-color: transparent;
+
+ &:hover:not(.ck-on) {
+ background: var(--hover-item-background-color);
+ color: var(--hover-item-text-color);
+ }
+
+ &.ck-on, &.ck-on:hover {
+ background: var(--button-group-active-button-background-color);
+ color: var(--button-group-active-button-color);
+
+ box-shadow: 1px 1px 1px var(--button-group-active-button-shadow-color);
+ }
+
+ &:focus-visible {
+ outline: 2px solid var(--input-focus-outline-color);
+ }
+ }
+}
diff --git a/apps/client/src/stylesheets/theme-next/forms.css b/apps/client/src/stylesheets/theme-next/forms.css
index 71815dc3a0..2fa8df48ae 100644
--- a/apps/client/src/stylesheets/theme-next/forms.css
+++ b/apps/client/src/stylesheets/theme-next/forms.css
@@ -1,266 +1,4 @@
-/*
- * Command buttons (.btn-primary / .btn-secondary / .btn-sm / .btn-success)
- */
-
-button.btn.btn-primary,
-button.btn.btn-secondary,
-button.btn.btn-sm:not(.select-button),
-button.btn.btn-success,
-button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text,
-.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text,
-button.ck.ck-button.ck-ai-assistant-form__icon-action {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- min-width: 120px;
- box-shadow: 1px 1px 1px var(--cmd-button-shadow-color);
- border: unset;
- border-radius: 6px;
- padding: 4px 16px;
- background: var(--cmd-button-background-color);
- color: var(--cmd-button-text-color);
-
- &.dropdown-toggle-split {
- min-width: unset;
- }
-}
-
-button.btn.btn-primary:hover,
-button.btn.btn-secondary:hover,
-button.btn.btn-sm:not(.select-button):hover,
-button.btn.btn-success:hover,
-button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):hover,
-.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text:not(.ck-disabled):hover,
-button.ck.ck-button.ck-ai-assistant-form__icon-action:not(.ck-disabled):hover {
- background: var(--cmd-button-hover-background-color);
- color: var(--cmd-button-hover-text-color);
-}
-
-button.btn.btn-primary:active,
-button.btn.btn-secondary:active,
-button.btn.btn-sm:not(.select-button):active,
-button.btn.btn-success:active,
-button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):active,
-.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text:not(.ck-disabled):active,
-button.ck.ck-button.ck-ai-assistant-form__icon-action:not(.ck-disabled):active {
- opacity: 0.85;
- box-shadow: unset;
- background: var(--cmd-button-background-color) !important;
- color: var(--cmd-button-text-color) !important;
- transform: scale(0.95);
-}
-
-button.btn.btn-primary:disabled,
-button.btn.btn-secondary:disabled,
-button.btn.btn-sm:not(.select-button):disabled,
-button.btn.btn-success:disabled,
-button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text.ck-disabled,
-.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text.ck-disabled,
-button.ck.ck-button.ck-ai-assistant-form__icon-action.ck-disabled {
- opacity: var(--cmd-button-disabled-opacity);
-}
-
-button.btn.btn-primary:focus-visible,
-button.btn.btn-secondary:focus-visible,
-button.btn.btn-sm:not(.select-button):focus-visible,
-button.btn.btn-success:focus-visible,
-button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):focus-visible,
-.ck-ai-assistant-form__actions > button.ck.ck-button.ck-button_with-text:not(.ck-disabled):focus-visible,
-button.ck.ck-button.ck-ai-assistant-form__icon-action:not(.ck-disabled):focus-visible,
-.tn-focusable-button:focus-visible {
- outline: 2px solid var(--input-focus-outline-color);
-}
-
-button.ck.ck-button.ck-ai-assistant-form__icon-action {
- min-width: unset;
- padding: 4px;
-}
-
-/* Button's icon. The text spacing is a margin rather than padding on purpose: transforms rotate the
- padding-box, so with one-sided padding a spinning icon (`bx-spin`, e.g. a refresh button while
- loading) orbits an off-center axis instead of rotating in place. Margin stays outside the
- transformed box, keeping the spacing identical while the glyph spins about its own center. */
-button.btn.btn-primary span.tn-icon,
-button.btn.btn-secondary span.tn-icon,
-button.btn.btn-sm span.tn-icon,
-button.btn.btn-success span.tn-icon {
- color: var(--cmd-button-icon-color);
- margin-inline-end: 0.35em;
- font-size: 1.2em;
-}
-
-/* An icon with no label beside it is the whole of the button, and the spacing above would only push
- it off centre. A label is a text node, which no selector reaches, so the button says so itself
- (see `tn-icon-only` in Button.tsx). Written after the rule it undoes, the two weighing the same. */
-button.btn.tn-icon-only span.tn-icon {
- margin-inline-end: 0;
-}
-
-/* Button's keyboard shortcut */
-button.btn.btn-primary kbd,
-button.btn.btn-secondary kbd,
-button.btn.btn-sm kbd,
-button.btn.btn-success kbd {
- margin-inline-start: 0.5em;
- background: var(--cmd-button-keyboard-shortcut-background);
- color: var(--cmd-button-keyboard-shortcut-color);
- font-size: 0.6em;
- text-transform: uppercase;
- letter-spacing: 0.5pt;
-}
-
-/*
- * Low profile buttons
- */
-
-button.tn-low-profile {
- appearance: none;
- background: transparent;
- border: 0;
- border-radius: 8px;
- color: inherit;
-}
-
-button.tn-low-profile:hover {
- background-color: var(--icon-button-hover-background);
-}
-
-/*
- * Icon buttons
- */
-
-:root .icon-action:not(.global-menu-button),
-:root .tn-tool-button,
-:root .btn-group .tn-tool-button:not(:last-child),
-:root .btn-group .tn-tool-button:last-child {
- width: var(--icon-button-size);
- height: var(--icon-button-size);
- border: unset !important;
- border-radius: 8px;
- padding: 0;
- text-align: center;
- color: var(--icon-button-color);
-}
-
-.btn-group .tn-tool-button + .tn-tool-button {
- margin-inline-start: 4px !important;
-}
-
-/* An action that takes something away, marked as such the way destructive menu items are. Given as
- the button's own colors rather than as a `color`, which the rules above and the hover one below
- would both out-specify. */
-:root .icon-action.destructive-action-icon {
- --icon-button-color: var(--dropdown-item-icon-destructive-color);
- --icon-button-hover-color: var(--dropdown-item-icon-destructive-color);
-}
-
-/* The "x" icon button */
-:root .icon-action.bx-x,
-:root .tn-tool-button.bx-x {
- --icon-button-hover-background: var(--tab-close-button-hover-background);
- --icon-button-hover-color: var(--tab-close-button-hover-color);
- --icon-button-size: 24px;
- --icon-button-icon-ratio: 0.8;
-
- border-radius: 50%;
-}
-
-/* The icon */
-:root .icon-action:not(.global-menu-button)::before,
-:root .tn-tool-button::before {
- display: block;
- line-height: 1;
- font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio));
-}
-
-:root .icon-action.disabled::before {
- opacity: .5;
-}
-
-:root .icon-action:not(.global-menu-button):hover,
-:root .icon-action:not(.global-menu-button).show,
-:root .tn-tool-button:hover,
-:root .tn-tool-button.show {
- background: var(--icon-button-hover-background);
- color: var(--icon-button-hover-color);
-}
-
-:root .icon-action:not(.global-menu-button):active::before,
-:root .tn-tool-button:active::before {
- transform: scale(0.85);
-}
-
-:root .icon-action:not(.global-menu-button):focus-visible,
-:root .tn-tool-button:focus-visible {
- outline: 2px solid var(--input-focus-outline-color);
-}
-
-/* Button groups */
-
-:root div.btn-group {
- display: flex;
- gap: 4px;
- border-radius: 8px;
- background: var(--button-group-background-color);
- padding: 4px;
-
- button,
- button.btn,
- button.btn.btn-secondary {
- --cmd-button-background-color: transparent;
- --cmd-button-shadow-color: transparent;
-
- min-width: unset;
- margin: 0;
- box-shadow: unset;
- border-radius: 8px;
-
- &.active, &.active:hover {
- background-color: var(--button-group-active-button-background-color);
- color: var(--button-group-active-button-color);
-
- box-shadow: 1px 1px 1px var(--button-group-active-button-shadow-color);
- }
- }
-
- .icon-action {
- --icon-button-size: 28px;
- --icon-button-icon-ratio: .75;
- width: calc(var(--icon-button-size) * 1.25);
- }
-}
-
-:root .ck.ck-ai-assistant-form .ck-ai-assistant-form__viewmodes {
- gap: 4px;
- border-radius: 8px;
- background: var(--button-group-background-color);
- padding: 4px;
-
- button.ck.ck-button {
- min-width: unset;
- margin: 0;
- box-shadow: unset;
- border-radius: 8px;
- background: transparent;
- border-color: transparent;
-
- &:hover:not(.ck-on) {
- background: var(--hover-item-background-color);
- color: var(--hover-item-text-color);
- }
-
- &.ck-on, &.ck-on:hover {
- background: var(--button-group-active-button-background-color);
- color: var(--button-group-active-button-color);
-
- box-shadow: 1px 1px 1px var(--button-group-active-button-shadow-color);
- }
-
- &:focus-visible {
- outline: 2px solid var(--input-focus-outline-color);
- }
- }
-}
+@import url(./buttons.css);
/*
* Selectable cards (import/export pickers) — mirror the button-group look: borderless, a recessed
diff --git a/packages/share-theme/src/base.css b/packages/share-theme/src/base.css
index ca878444c7..501c3b210c 100644
--- a/packages/share-theme/src/base.css
+++ b/packages/share-theme/src/base.css
@@ -96,6 +96,21 @@ html.theme-light {
--more-accented-background-color: var(--card-background-hover-color);
--hover-item-text-color: black;
--icon-button-hover-background: #0000001a;
+ /* The buttons of `theme-next-light.css`, which the app views' toolbars draw from. */
+ --input-background-color: #00000012;
+ --cmd-button-background-color: #0000000f;
+ --cmd-button-text-color: #000000ad;
+ --cmd-button-hover-background-color: #00000016;
+ --cmd-button-hover-text-color: #000;
+ --cmd-button-shadow-color: #00000040;
+ --cmd-button-icon-color: black;
+ --cmd-button-keyboard-shortcut-background: #00000017;
+ --cmd-button-keyboard-shortcut-color: black;
+ --button-group-background-color: var(--input-background-color);
+ --button-group-active-button-background-color: white;
+ --button-group-active-button-color: black;
+ --button-group-active-button-shadow-color: #00000056;
+ --tab-close-button-hover-background: #c95a5a;
--active-item-text-color: #383838;
--active-item-background-color: #ddd;
/* The overlay buttons of `theme-next-light.css`. */
@@ -185,6 +200,21 @@ html.theme-dark {
--more-accented-background-color: var(--card-background-hover-color);
--hover-item-text-color: #efefef;
--icon-button-hover-background: #ffffff16;
+ /* The buttons of `theme-next-dark.css`. */
+ --input-background-color: #ffffff12;
+ --cmd-button-background-color: #ffffff28;
+ --cmd-button-text-color: #ffffffc2;
+ --cmd-button-hover-background-color: #ffffff37;
+ --cmd-button-hover-text-color: white;
+ --cmd-button-shadow-color: #00000080;
+ --cmd-button-icon-color: white;
+ --cmd-button-keyboard-shortcut-background: #0000004d;
+ --cmd-button-keyboard-shortcut-color: white;
+ --button-group-background-color: #00000051;
+ --button-group-active-button-background-color: #4f4f4f;
+ --button-group-active-button-color: white;
+ --button-group-active-button-shadow-color: #000000;
+ --tab-close-button-hover-background: #a45353;
--active-item-text-color: #aaaaaa;
--active-item-background-color: #777;
/* The overlay buttons of `theme-next-dark.css`. */
@@ -217,6 +247,14 @@ html.theme-dark {
/* The frosting of `theme-next/base.css` behind the translucent overlay buttons. */
--overlay-button-backdrop-filter: blur(32px) saturate(1000%);
--opaque-icon-button-hover-color: var(--hover-item-text-color);
+ /* The buttons shared by both modes, from `theme-next-light.css` and `theme-next/base.css`. */
+ --button-text-color: currentColor;
+ --cmd-button-disabled-opacity: 0.5;
+ --icon-button-color: currentColor;
+ --icon-button-hover-color: var(--hover-item-text-color);
+ --icon-button-size: 32px;
+ --icon-button-icon-ratio: 0.65;
+ --tab-close-button-hover-color: white;
}
/* The context menu's own offset in `theme-next/shell.css`, for its smaller icons. */
diff --git a/packages/share-theme/src/content/app_globals.ts b/packages/share-theme/src/content/app_globals.ts
index e74c03bfe2..604c0e63fd 100644
--- a/packages/share-theme/src/content/app_globals.ts
+++ b/packages/share-theme/src/content/app_globals.ts
@@ -1,6 +1,8 @@
-// Ahead of the views' own stylesheets, which draw over Bootstrap's tooltips and menus.
+// Ahead of the views' own stylesheets, which draw over Bootstrap's tooltips, menus and buttons.
import "./bootstrap.scss";
import "@triliumnext/client/src/stylesheets/menus.css";
+import "@triliumnext/client/src/stylesheets/buttons.css";
+import "@triliumnext/client/src/stylesheets/theme-next/buttons.css";
import "@triliumnext/client/src/stylesheets/theme-next/menus.css";
import $ from "jquery";