Skip to content

Commit

Permalink
Merge pull request #5929 from nextcloud/fix/attachments_icon
Browse files Browse the repository at this point in the history
fix(menu): Use paperclip icon for inserting attachments menu item
  • Loading branch information
mejo- authored Jun 19, 2024
2 parents 5a6305d + 4491acc commit af5b970
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 8 additions & 0 deletions src/components/Menu/ActionEntry.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Menu/entries.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import {
FormatListBulleted,
FormatListCheckbox,
FormatQuote,
Images,
Info,
LinkIcon,
Paperclip,
Positive,
Table,
Warn,
Expand Down Expand Up @@ -335,7 +335,7 @@ export default [
{
key: 'insert-attachment',
label: t('text', 'Insert attachment'),
icon: Images,
icon: Paperclip,
component: ActionAttachmentUpload,
priority: 1,
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit af5b970

Please sign in to comment.