diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs index 338af161e5c..961d37e8245 100644 --- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs @@ -16,7 +16,7 @@

{{title}}

{{#if subtitle}} -

{{subtitle}}

+

{{subtitle}}

{{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs index 5df7c693906..bd3d19425e8 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs @@ -1,4 +1,7 @@ -{{#d-modal-body rawTitle=(if post (i18n "post.share.title" post_number=post.post_number) (i18n "topic.share.title"))}} +{{#d-modal-body + rawTitle=(if post (i18n "post.share.title" post_number=post.post_number) (i18n "topic.share.title")) + rawSubtitle=(if post displayDate) +}}
- - {{#if post}} -
{{displayDate}}
- {{/if}}
{{/d-modal-body}} diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 44b7dc3d793..a7a9d295419 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -31,12 +31,6 @@ .new-topic { margin-right: 0; } - - .date { - color: var(--primary-med-or-secondary-med); - font-weight: normal; - margin-left: auto; - } } .share-twitter { @@ -53,6 +47,12 @@ // topic share modal .share-topic-modal { + .modal-header { + .subtitle { + color: var(--primary-med-or-secondary-med); + } + } + form { margin-bottom: 0; } diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index c4a54245d22..fc7c89de077 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -111,6 +111,15 @@ .create-invite-modal, .create-invite-bulk-modal, .share-topic-modal { + .title { + align-items: center; + display: flex; + + .subtitle { + margin-left: 0.5em; + } + } + &.modal .modal-body { margin: 1em; padding: unset;