From 1db3354722f3a045a71b0a9bc64e55ad856345ba Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Wed, 18 Dec 2024 13:19:45 -0500 Subject: [PATCH] Adjust presence styling to match recent core changes --- app/assets/stylesheets/common/base/topic-footer.scss | 1 - app/assets/stylesheets/common/base/topic.scss | 3 +++ app/assets/stylesheets/mobile/topic-footer.scss | 5 ----- .../discourse-presence/assets/stylesheets/presence.scss | 8 ++++++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-footer.scss b/app/assets/stylesheets/common/base/topic-footer.scss index 9042457981b..16c278fbf2b 100644 --- a/app/assets/stylesheets/common/base/topic-footer.scss +++ b/app/assets/stylesheets/common/base/topic-footer.scss @@ -53,7 +53,6 @@ } } - right: 10px; display: flex; justify-content: flex-end; diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 3daa7244031..dd10147b623 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -87,6 +87,9 @@ grid-template-areas: "posts"; grid-template-columns: auto; .topic-navigation { + display: flex; + justify-content: flex-end; + align-items: center; grid-area: posts; grid-row: 3; width: auto; diff --git a/app/assets/stylesheets/mobile/topic-footer.scss b/app/assets/stylesheets/mobile/topic-footer.scss index 0eea67aaff3..f1bcd20bb7e 100644 --- a/app/assets/stylesheets/mobile/topic-footer.scss +++ b/app/assets/stylesheets/mobile/topic-footer.scss @@ -1,8 +1,3 @@ -.container.posts .topic-navigation { - display: flex; - justify-content: flex-end; - align-items: center; -} html:not(.anon) #topic-footer-buttons { .topic-footer-main-buttons { width: 100%; diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss index 83e6002ef47..ddd30ceb97b 100644 --- a/plugins/discourse-presence/assets/stylesheets/presence.scss +++ b/plugins/discourse-presence/assets/stylesheets/presence.scss @@ -1,5 +1,5 @@ .topic-above-footer-buttons-outlet.presence { - min-height: 1.8em; // height of the avatars, prevents layout shift + min-height: 2.5em; // height of the avatars, prevents layout shift margin: var(--below-topic-margin) 0; } @@ -7,6 +7,9 @@ background-color: var(--secondary); color: var(--primary-medium); display: flex; + padding: 0.5em; + padding-left: 0; + border-radius: var(--d-border-radius); span.presence-text { align-items: center; @@ -97,7 +100,8 @@ body:has(.topic-navigation.with-topic-progress) } .topic-navigation-bottom-outlet.presence { - margin: var(--below-topic-margin) auto 0 0; + margin-right: auto; + margin-top: 0.2em; min-height: 1.8em; // height of the avatars, prevents layout shift order: -1; }