IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict after merge Make-Header-Menu-To-Component

Browse Source
This commit is contained in:
ogerly 2022-10-27 09:06:57 +02:00
commit 613812e3e9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/Group/GroupTeaser.vue
View File

@ -13,8 +13,8 @@
<!-- group slug -->
<div>
<ds-text color="soft">
<base-icon name="at" />
{{ group.slug }}
<!-- <base-icon name="at" data-test="ampersand" /> -->
{{ `&${group.slug}` }}
</ds-text>
</div>
<!-- group location -->
@ -31,7 +31,7 @@
<footer class="footer">
<div>
<!-- group my role in group -->
<ds-chip color="primary">
<ds-chip v-if="group && group.myRole" color="primary">
{{ group && group.myRole ? $t('group.roles.' + group.myRole) : '' }}
</ds-chip>
<!-- group type -->

4
webapp/layouts/default.vue
View File

@ -32,13 +32,13 @@ export default {
data() {
return {
windowWidth: null,
maxMobileWidth: 811,
maxMobileWidth: 810,
}
},
computed: {
showMobileMenu() {
if (!this.windowWidth) return false
return this.windowWidth < this.maxMobileWidth
return this.windowWidth <= this.maxMobileWidth
},
},
mounted() {