From 908a71d51cbc312097a0087838eac7e73ac456b5 Mon Sep 17 00:00:00 2001 From: Jonas Date: Wed, 19 Jun 2024 16:50:00 +0200 Subject: [PATCH 1/2] fix(menu): Use paperclip icon for inserting attachments menu item Fixes: #5385 Signed-off-by: Jonas --- src/components/Menu/entries.js | 4 ++-- src/components/icons.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Menu/entries.js b/src/components/Menu/entries.js index 906c02ce975..4cc9b0a875d 100644 --- a/src/components/Menu/entries.js +++ b/src/components/Menu/entries.js @@ -23,9 +23,9 @@ import { FormatListBulleted, FormatListCheckbox, FormatQuote, - Images, Info, LinkIcon, + Paperclip, Positive, Table, Warn, @@ -335,7 +335,7 @@ export default [ { key: 'insert-attachment', label: t('text', 'Insert attachment'), - icon: Images, + icon: Paperclip, component: ActionAttachmentUpload, priority: 1, }, diff --git a/src/components/icons.js b/src/components/icons.js index f28e93f9514..5e9845690a7 100644 --- a/src/components/icons.js +++ b/src/components/icons.js @@ -35,13 +35,13 @@ import MDI_FormatStrikethrough from 'vue-material-design-icons/FormatStrikethrou import MDI_FormatUnderline from 'vue-material-design-icons/FormatUnderline.vue' import MDI_Help from 'vue-material-design-icons/HelpCircle.vue' import MDI_Image from 'vue-material-design-icons/ImageOutline.vue' -import MDI_Images from 'vue-material-design-icons/ImageMultipleOutline.vue' import MDI_Info from 'vue-material-design-icons/Information.vue' import MDI_Link from 'vue-material-design-icons/Link.vue' import MDI_LinkOff from 'vue-material-design-icons/LinkOff.vue' import MDI_LinkVariantPlus from 'vue-material-design-icons/LinkVariantPlus.vue' import MDI_Loading from 'vue-material-design-icons/Loading.vue' import MDI_Lock from 'vue-material-design-icons/Lock.vue' +import MDI_Paperclip from 'vue-material-design-icons/Paperclip.vue' import MDI_Positive from 'vue-material-design-icons/CheckboxMarkedCircle.vue' import MDI_Redo from 'vue-material-design-icons/ArrowURightTop.vue' import MDI_Shape from 'vue-material-design-icons/Shape.vue' @@ -113,12 +113,12 @@ export const FormatStrikethrough = makeIcon(MDI_FormatStrikethrough) export const FormatUnderline = makeIcon(MDI_FormatUnderline) export const Help = makeIcon(MDI_Help) export const Image = makeIcon(MDI_Image) -export const Images = makeIcon(MDI_Images) export const Info = makeIcon(MDI_Info) export const LinkIcon = makeIcon(MDI_Link) export const LinkOff = makeIcon(MDI_LinkOff) export const LinkVariantPlus = makeIcon(MDI_LinkVariantPlus) export const Lock = makeIcon(MDI_Lock) +export const Paperclip = makeIcon(MDI_Paperclip) export const Positive = makeIcon(MDI_Positive) export const Redo = makeIcon(MDI_Redo) export const Shape = makeIcon(MDI_Shape) From 4491accc7a51f1a067a27438b170875be128db40 Mon Sep 17 00:00:00 2001 From: Jonas Date: Wed, 19 Jun 2024 17:23:18 +0200 Subject: [PATCH 2/2] fix(menu): Fix hover background color for emoji button Signed-off-by: Jonas --- src/components/Menu/ActionEntry.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/Menu/ActionEntry.scss b/src/components/Menu/ActionEntry.scss index 63514d3525c..bc201f6891f 100644 --- a/src/components/Menu/ActionEntry.scss +++ b/src/components/Menu/ActionEntry.scss @@ -4,6 +4,14 @@ */ .text-menubar, .v-popper__inner { + .entry-action__emoji button.entry-action__button { + &:hover, + &:focus, + &:active { + background-color: var(--color-background-hover); + } + } + button.entry-action__button { height: 44px; margin: 0;