diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-09-04 14:19:56 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-09-04 14:19:56 +0000 |
| commit | 176dacb6ba6de9bf47798ff1ed56f0fd84f2ff68 (patch) | |
| tree | f3ee968faf1b8e6c75f3c0d4dc4b93158eef493b /src/components/timeline | |
| parent | bf0008594622acc31af6f43607c4d89f1c19d287 (diff) | |
| parent | 0041faaed8d79a8637ca2c371db2d3b1ff5ac37f (diff) | |
Merge branch 'mergeback-master' into 'develop'
Merge master back into develop
See merge request pleroma/pleroma-fe!1934
Diffstat (limited to 'src/components/timeline')
| -rw-r--r-- | src/components/timeline/timeline.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss index 0fc0d979..2dd66328 100644 --- a/src/components/timeline/timeline.scss +++ b/src/components/timeline/timeline.scss @@ -26,7 +26,7 @@ } .conversation-heading { - top: calc(var(--__panel-heading-height) * var(--currentPanelStack, 2)); + top: calc(var(--__panel-heading-height) * var(--currentPanelStack, 1) + var(--navbar-height)); z-index: 2; } |
