diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-03-01 12:12:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-03-01 12:12:12 +0000 |
| commit | 6d7b5b157b64df5b189dd4e64e382bdda17e8897 (patch) | |
| tree | 4a853bd60ad8aad57887fefd9d69952c82889131 /src/components/timeline/timeline.vue | |
| parent | a90910be8fb1f3ebde4177fcf08ec5024da44755 (diff) | |
| parent | fc5483f7641f3aa6866fbbd9beaca0139083ee86 (diff) | |
Merge branch 'feat/timeline-quick-settings' into 'develop'
close #1050 - add a quick settings menu to timeline header
Closes #1050
See merge request pleroma/pleroma-fe!1355
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 4c43fe5c..286477c2 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -16,6 +16,7 @@ > {{ $t('timeline.up_to_date') }} </div> + <TimelineQuickSettings v-if="!embedded" /> </div> <div :class="classes.body"> <div @@ -103,9 +104,12 @@ max-width: 100%; flex-wrap: nowrap; align-items: center; + position: relative; + .loadmore-button { flex-shrink: 0; } + .loadmore-text { flex-shrink: 0; line-height: 1em; |