hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'threecolumn' into shigusegubu-vue3

Browse source 
* threecolumn:
  fixate conversation heading
  fix overflow that sometimes happens in sidebar due to too wide file upload element
This commit is contained in:
Henry Jameson 2022-04-20 00:01:27 +03:00
commit 3327b2d0b6
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/conversation/conversation.vue
View file

@ -7,7 +7,7 @@
> >
<div <div
v-if="isExpanded" v-if="isExpanded"
class="panel-heading conversation-heading" class="panel-heading conversation-heading -sticky"
> >
<span class="title"> {{ $t('timeline.conversation') }} </span> <span class="title"> {{ $t('timeline.conversation') }} </span>
<button <button

2
src/components/media_upload/media_upload.vue
View file

@ -19,7 +19,7 @@
v-if="uploadReady" v-if="uploadReady"
:disabled="disabled" :disabled="disabled"
type="file" type="file"
style="position: fixed; top: -100em" style="position: fixed; top: -100em; max-width: 0; max-height: 0"
multiple="true" multiple="true"
@change="change" @change="change"
> >

4
src/components/timeline/timeline.scss
View file

@ -27,4 +27,8 @@
.timeline-footer { .timeline-footer {
border: none; border: none;
} }
.conversation-heading {
top: calc(var(--panel-heading-height) * 2);
}
} }