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

Merge branch 'master' into 346-mark_as_read

Browse Source
This commit is contained in:
Robert Schäfer 2019-04-10 11:36:45 +02:00 committed by GitHub
commit e61abed88c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webapp/components/ContentMenu.vue
View File

@ -111,9 +111,8 @@ export default {
if (this.isOwner && this.resourceType === 'user') {
routes.push({
name: this.$t(`settings.data.name`),
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
callback: () => this.$router.push('/settings'),
name: this.$t(`settings.name`),
path: '/settings',
icon: 'edit'
})
}

4
webapp/pages/index.vue
View File

@ -149,8 +149,8 @@ export default {
.post-add-button {
z-index: 100;
position: fixed;
top: 100vh;
left: 100vw;
top: 98vh;
left: 98vw;
transform: translate(-120%, -120%);
box-shadow: $box-shadow-x-large;
}