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 feat-filter-buttons

Browse Source
This commit is contained in:
Hannes Heine 2023-03-14 10:52:29 +01:00 committed by GitHub
commit 41e1c722ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/components/Category/index.vue
View File

@ -30,6 +30,7 @@ export default {
}
}
.filterActive {
background-color: $color-success-active;
color: $color-primary-inverse;
background-color: $color-primary-active;
}
</style>

14
webapp/components/PostTeaser/PostTeaser.vue
View File

@ -26,7 +26,7 @@
v-observe-visibility="(isVisible, entry) => visibilityChanged(isVisible, entry, post.id)"
>
<div class="categories" v-if="categoriesActive">
<hc-category
<category
v-for="category in post.categories"
:key="category.id"
v-tooltip="{
@ -81,11 +81,11 @@
</template>
<script>
import UserTeaser from '~/components/UserTeaser/UserTeaser'
import Category from '~/components/Category'
import ContentMenu from '~/components/ContentMenu/ContentMenu'
import HcRibbon from '~/components/Ribbon'
import HcCategory from '~/components/Category'
import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
import HcRibbon from '~/components/Ribbon'
import UserTeaser from '~/components/UserTeaser/UserTeaser'
import { mapGetters } from 'vuex'
import PostMutations from '~/graphql/PostMutations'
import { postMenuModalsData, deletePostMutation } from '~/components/utils/PostHelpers'
@ -93,11 +93,11 @@ import { postMenuModalsData, deletePostMutation } from '~/components/utils/PostH
export default {
name: 'PostTeaser',
components: {
UserTeaser,
HcCategory,
HcRibbon,
Category,
ContentMenu,
CounterIcon,
HcRibbon,
UserTeaser,
},
props: {
post: {