ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-14 08:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into search-users-to-add-to-group

Browse Source
This commit is contained in:
Moriz Wahl 2022-11-22 12:31:56 +01:00
commit 3c4eb2fc91
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/db/seed.js
View File

@ -9,9 +9,9 @@ import {
createGroupMutation,
joinGroupMutation,
changeGroupMemberRoleMutation,
} from './graphql/groups'
import { createPostMutation } from './graphql/posts'
import { createCommentMutation } from './graphql/comments'
} from '../graphql/groups'
import { createPostMutation } from '../graphql/posts'
import { createCommentMutation } from '../graphql/comments'
import { categories } from '../constants/categories'
if (CONFIG.PRODUCTION && !CONFIG.PRODUCTION_DB_CLEAN_ALLOW) {

4
webapp/components/HeaderMenu/HeaderMenu.vue
View File

@ -94,7 +94,7 @@
<!-- mobile header menu -->
<div v-else class="mobil-header-box">
<!-- logo, hamburger-->
<ds-flex>
<ds-flex style="align-items: center">
<ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
<a
v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
@ -112,7 +112,7 @@
</nuxt-link>
</ds-flex-item>
<!-- hamburger button -->
<!-- mobile hamburger menu -->
<ds-flex-item class="mobile-hamburger-menu">
<client-only>
<div style="display: inline-flex; padding-right: 20px">