diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss index dc8c55d33..06a0ebb66 100644 --- a/assets/scss/styles.scss +++ b/assets/scss/styles.scss @@ -110,13 +110,24 @@ a { .tippy-popper { .tooltip-theme { - @apply bg-secondary; + @apply bg-tooltip; @apply text-primaryLight; @apply text-xs; @apply font-semibold; + @apply py-1; @apply px-2; - @apply px-4; @apply shadow; + + kbd { + @apply first:ml-2; + @apply last:-mr-1; + @apply font-sans; + @apply bg-secondaryDark; + @apply text-primaryDark; + @apply rounded; + @apply px-1; + @apply ml-1; + } } .popover-theme { @@ -124,6 +135,7 @@ a { @apply text-secondary; @apply p-2; @apply shadow-lg; + @apply focus:outline-none; } &[x-placement^="top"] .tippy-tooltip .tippy-arrow { diff --git a/assets/scss/themes.scss b/assets/scss/themes.scss index eea28fbae..39da2b4e0 100644 --- a/assets/scss/themes.scss +++ b/assets/scss/themes.scss @@ -53,7 +53,7 @@ // Error color --error-color: theme("colors.true-gray.700"); // Tooltip color - --tooltip-color: theme("colors.true-gray.50"); + --tooltip-color: theme("colors.true-gray.700"); // Editor theme --editor-theme: "textmate"; } diff --git a/components/app/Announcement.vue b/components/app/Announcement.vue index b2e9cf97b..4129e1542 100644 --- a/components/app/Announcement.vue +++ b/components/app/Announcement.vue @@ -1,21 +1,21 @@ diff --git a/components/app/Header.vue b/components/app/Header.vue index c86203920..dd12538b3 100644 --- a/components/app/Header.vue +++ b/components/app/Header.vue @@ -1,9 +1,9 @@ @@ -119,7 +122,7 @@ import intializePwa from "~/helpers/pwa" import { currentUser$ } from "~/helpers/fb/auth" import { getLocalConfig, setLocalConfig } from "~/newstore/localpersistence" -// import { hasExtensionInstalled } from "~/helpers/strategies/ExtensionStrategy" +import { getPlatformSpecialKey } from "~/helpers/platformutils" export default { data() { @@ -176,6 +179,7 @@ export default { // fallback } }, + getSpecialKey: getPlatformSpecialKey, }, } diff --git a/components/app/Logo.vue b/components/app/Logo.vue index de3fa21c5..f11358f31 100644 --- a/components/app/Logo.vue +++ b/components/app/Logo.vue @@ -1,6 +1,6 @@ @@ -91,6 +107,10 @@ export default { type: Boolean, default: false, }, + shortcuts: { + type: Array, + default: () => [], + }, }, } diff --git a/components/collections/Add.vue b/components/collections/Add.vue index 836c556a0..50e2d08a5 100644 --- a/components/collections/Add.vue +++ b/components/collections/Add.vue @@ -5,8 +5,8 @@