mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #2438 from pixelfed/staging 

Update DM components
This commit is contained in:
daniel 2020-11-19 02:16:40 -07:00 committed by GitHub
parent 5cfa08946e fcb785bb0f
commit bf92faf810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/direct.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@ -14,7 +14,7 @@
"/js/compose.js": "/js/compose.js?id=bd3e195dc7cf1ed0cd33",
"/js/compose-classic.js": "/js/compose-classic.js?id=283f19c895f4118a2a8b",
"/js/developers.js": "/js/developers.js?id=f75deca5ccf47d43eb07",
"/js/direct.js": "/js/direct.js?id=ffc75ccefaaea359dab5",
"/js/direct.js": "/js/direct.js?id=6a80114ecc453b2b994a",
"/js/discover.js": "/js/discover.js?id=6d88f29999bdd651ec35",
"/js/hashtag.js": "/js/hashtag.js?id=eb4ce037114cd78a8678",
"/js/loops.js": "/js/loops.js?id=1dcb3790eb9ea4ea5848",
@ -28,5 +28,5 @@
"/js/status.js": "/js/status.js?id=b744f13cca28d1e9964e",
"/js/story-compose.js": "/js/story-compose.js?id=6308c4b7cb5baa4517d3",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=ece67a5ba28761df4d88",
"/js/timeline.js": "/js/timeline.js?id=8e47506fff6751b8647f"
"/js/timeline.js": "/js/timeline.js?id=1c669431fc1f27faca58"
}

2
resources/assets/js/components/DirectMessage.vue
View File

@ -84,6 +84,7 @@
{{convo.text}}
</p>
<p v-if="!hideTimestamps" class="small text-muted font-weight-bold ml-2 d-flex align-items-center justify-content-start" data-timestamp="timestamp"> <span v-if="convo.hidden" class="mr-2 small" title="Filtered Message" data-toggle="tooltip" data-placement="bottom"><i class="fas fa-lock"></i></span> {{convo.timeAgo}}</p>
<p v-else>&nbsp;</p>
</div>
</div>
<div v-else class="media d-inline-flex float-right mb-0">
@ -131,6 +132,7 @@
</p>
<p v-if="!hideTimestamps" class="small text-muted font-weight-bold text-right mr-2"> <span v-if="convo.hidden" class="mr-2 small" title="Filtered Message" data-toggle="tooltip" data-placement="bottom"><i class="fas fa-lock"></i></span> {{convo.timeAgo}}
</p>
<p v-else>&nbsp;</p>
</div>
<img v-if="!hideAvatars" class="ml-3 mt-2 rounded-circle img-thumbnail" :src="profile.avatar" alt="avatar" width="32px">
</div>

2
resources/assets/js/components/StoryTimelineComponent.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<div v-if="show" class="card card-body p-0 border mt-4 mb-3 shadow-none">
<div v-if="show" class="card card-body p-0 border mt-md-4 mb-md-3 shadow-none">
<div id="storyContainer" :class="[list == true ? 'mt-1 mr-3 mb-0 ml-1':'mx-3 mt-3 mb-0 pb-0']"></div>
</div>
</div>

8
resources/assets/js/components/Timeline.vue
View File

@ -6,7 +6,7 @@
<button class="btn btn-dark px-4 rounded-pill font-weight-bold shadow" @click="syncNewPosts">Load New Posts</button>
</p>
</div>
<div class="col-12 pl-3 pl-md-0 pt-3 pl-0">
<div class="d-none d-md-block col-12 pl-3 pl-md-0 pt-3 pl-0">
<div class="d-none d-md-flex justify-content-between align-items-center">
<p class="lead text-muted mb-0"><i :class="[scope == 'home' ? 'fas fa-home':'fas fa-stream']"></i> &nbsp; {{scope == 'local' ? 'Public' : 'Home'}} Timeline</p>
<p class="mb-0">
@ -24,7 +24,7 @@
<hr>
</div>
<div :class="[modes.distractionFree ? 'col-md-8 col-lg-8 offset-md-2 px-0 mb-sm-3 timeline order-2 order-md-1':'col-md-8 col-lg-8 px-0 mb-sm-3 timeline order-2 order-md-1']">
<div style="margin-top:-8px;">
<div style="margin-top:-2px;">
<story-component v-if="config.features.stories"></story-component>
</div>
<div>
@ -33,7 +33,7 @@
<span class="sr-only">Loading...</span>
</div>
</div>
<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`" class="pt-4">
<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`">
<div v-if="index == 0 && showTips && !loading" class="mb-4 card-tips">
<announcements-card v-on:show-tips="showTips = $event"></announcements-card>
</div>
@ -257,7 +257,7 @@
</div>
</div>
<div v-if="!modes.distractionFree" class="col-md-4 col-lg-4 my-3 order-1 order-md-2 d-none d-md-block">
<div v-if="!modes.distractionFree" class="col-md-4 col-lg-4 my-4 order-1 order-md-2 d-none d-md-block">
<div>
<!-- <div class="mb-4">