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

Merge pull request #4208 from Ocelot-Social-Community/remove-emojis

Browse Source 
refactor: 🍰 Remove Emojis From Post Page
This commit is contained in:
Moriz Wahl 2021-02-11 13:10:49 +01:00 committed by GitHub
commit 0bbb90387d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 204 additions and 13893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14081
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

2
backend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ocelot-social-backend", "name": "ocelot-social-backend",
"version": "0.6.7", "version": "0.6.8",
"description": "GraphQL Backend for ocelot.social", "description": "GraphQL Backend for ocelot.social",
"repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "ocelot.social Community", "author": "ocelot.social Community",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ocelot-social", "name": "ocelot-social",
"version": "0.6.7", "version": "0.6.8",
"description": "Fullstack and API tests with cypress and cucumber for ocelot.social", "description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
"author": "ocelot.social Community", "author": "ocelot.social Community",
"license": "MIT", "license": "MIT",

2
webapp/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ocelot-social-webapp", "name": "ocelot-social-webapp",
"version": "0.6.7", "version": "0.6.8",
"description": "ocelot.social Frontend", "description": "ocelot.social Frontend",
"repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "ocelot.social Community", "author": "ocelot.social Community",

10
webapp/pages/post/_id/_slug/index.vue
View File

@ -44,19 +44,13 @@
<h2 class="title hyphenate-text">{{ post.title }}</h2> <h2 class="title hyphenate-text">{{ post.title }}</h2>
<ds-space margin-bottom="small" /> <ds-space margin-bottom="small" />
<content-viewer class="content hyphenate-text" :content="post.content" /> <content-viewer class="content hyphenate-text" :content="post.content" />
<!-- eslint-enable vue/no-v-html -->
<ds-space margin="xx-large" />
<ds-space margin-bottom="small" />
<!-- Tags --> <!-- Tags -->
<div v-if="post.tags && post.tags.length" class="tags"> <div v-if="post.tags && post.tags.length" class="tags">
<ds-space margin="xx-small" /> <ds-space margin="xx-small" />
<hc-hashtag v-for="tag in sortedTags" :key="tag.id" :id="tag.id" /> <hc-hashtag v-for="tag in sortedTags" :key="tag.id" :id="tag.id" />
</div> </div>
<ds-space margin-top="x-large"> <ds-space margin-top="small">
<ds-flex :gutter="{ lg: 'small' }"> <ds-flex :gutter="{ lg: 'small' }">
<ds-flex-item :width="{ lg: '75%', md: '75%', sm: '75%', base: '100%' }">
<hc-emotions :post="post" />
</ds-flex-item>
<!-- Shout Button --> <!-- Shout Button -->
<ds-flex-item <ds-flex-item
:width="{ lg: '15%', md: '22%', sm: '22%', base: '100%' }" :width="{ lg: '15%', md: '22%', sm: '22%', base: '100%' }"
@ -107,7 +101,6 @@ import {
sortTagsAlphabetically, sortTagsAlphabetically,
} from '~/components/utils/PostHelpers' } from '~/components/utils/PostHelpers'
import PostQuery from '~/graphql/PostQuery' import PostQuery from '~/graphql/PostQuery'
import HcEmotions from '~/components/Emotions/Emotions'
import PostMutations from '~/graphql/PostMutations' import PostMutations from '~/graphql/PostMutations'
import links from '~/constants/links.js' import links from '~/constants/links.js'
@ -124,7 +117,6 @@ export default {
ContentMenu, ContentMenu,
CommentForm, CommentForm,
CommentList, CommentList,
HcEmotions,
ContentViewer, ContentViewer,
}, },
head() { head() {