ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 6146-notification-menu-buttons-position

Browse Source
This commit is contained in:
Wolfgang Huß 2023-03-20 15:00:28 +01:00 committed by GitHub
commit d3ec738ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/Button/JoinLeaveButton.vue
View File

@ -63,7 +63,7 @@ export default {
content: this.$t('group.joinLeaveButton.tooltip'),
placement: 'right',
show: this.isMember && !this.isNonePendingMember && this.hovered,
trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
trigger: 'manual',
}
},
},

2
webapp/components/MasonryGrid/MasonryGrid.vue
View File

@ -30,7 +30,7 @@ export default {
/* dirty fix to override broken styleguide inline-styles */
.ds-grid {
grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)) !important;
gap: 32px 16px !important;
gap: 16px !important;
grid-auto-rows: 20px;
}