A platform for community discussion. Free, open, simple.
UX: updates to PM topic map and styles (#41268)
Krisb5c90e82c666
diff --git a/app/assets/stylesheets/common/base/personal-message.scss b/app/assets/stylesheets/common/base/personal-message.scssindex f99fe91d3eb..57572f8ba58 100644--- a/app/assets/stylesheets/common/base/personal-message.scss+++ b/app/assets/stylesheets/common/base/personal-message.scss@@ -1,12 +1,14 @@@use "lib/viewport";.archetype-private_message {- --pm-padding: 1.25em;+ --pm-padding: var(--space-5);+ --pm-content-width: calc(+ var(--topic-body-width) + var(--topic-body-width-padding) * 2 ++ var(--pm-padding)+ );.topic-post {- @include viewport.from(sm) {- margin-bottom: 0.5em;- }+ margin-bottom: var(--space-4);@include viewport.until(sm) {article {@@ -15,7 +17,58 @@}&:last-child {- margin-bottom: 1.5em;+ margin-bottom: var(--space-6);+ }+ }++ .small-action {+ margin-bottom: var(--space-4);++ @include viewport.until(sm) {+ border-radius: var(--d-border-radius);+ border: 1px solid var(--content-border-color);+ }++ .topic-avatar {+ border-top: none;+ padding-top: 1.1em;++ @include viewport.until(sm) {+ display: none;+ }++ .d-icon {+ margin-right: -0.25em;+ background: var(--secondary);+ }+ }++ .small-action-desc {+ margin-left: calc(var(--pm-padding) * -1);+ padding-left: var(--space-8);+ border-radius: var(--d-border-radius);+ width: var(--pm-content-width);++ @include viewport.until(sm) {+ border: 0;+ }++ @include viewport.from(sm) {+ border: 1px solid var(--content-border-color);+ }+ }++ .small-action-buttons {+ margin-right: var(--space-4);+ }++ &.topic-post-visited {+ max-width: var(--pm-content-width);++ @include viewport.from(sm) {+ margin-left: 1.6em;+ margin-bottom: var(--space-6);+ }}}@@ -27,17 +80,22 @@@include viewport.until(sm) {margin-left: 0;- padding: 1.5em 1em 0;+ padding: var(--space-6) var(--space-4) 0;}}+ .topic-timer-info,.topic-avatar,.topic-body {border: none;}- @include viewport.until(sm) {- .topic-avatar {+ .topic-avatar {+ .avatar {+ background: var(--secondary);+ }++ @include viewport.until(sm) {margin-bottom: -1em; // intentional overlap}}@@ -51,7 +109,7 @@.cooked {box-sizing: border-box;- margin-top: 0.25em;+ margin-top: var(--space-1);padding-right: calc(var(--topic-body-width-padding) * 2);@include viewport.until(sm) {@@ -62,7 +120,7 @@}.post-menu-area {- margin: 0.5em 0 var(--topic-body-width-padding);+ margin: var(--space-2) 0 var(--topic-body-width-padding);@include viewport.from(sm) {padding-right: var(--topic-body-width-padding);@@ -79,8 +137,8 @@border-radius: var(--d-border-radius);background-color: var(--tertiary-very-low);border-color: var(--tertiary-very-low);- margin-bottom: 1em;- padding: var(--pm-padding) 1em;+ margin-bottom: var(--space-4);+ padding: var(--pm-padding) var(--space-4);width: 100%;max-width: calc(var(--topic-body-width) + var(--topic-body-width-padding) * 2 +@@ -89,7 +147,7 @@@include viewport.from(sm) {margin-left: 1.65em;- padding-inline: 2em;+ padding-inline: var(--space-8);}&.old {@@ -102,42 +160,26 @@}.topic-map {- border: none;- padding-block: var(--pm-padding);+ margin-top: var(--space-2);+ padding: var(--space-3) var(--space-3) var(--space-3) var(--space-8);display: grid;grid-template-areas: "contents additional" "pm-map pm-map";grid-template-columns: 1fr auto;border-radius: var(--d-border-radius);+ row-gap: var(--space-2);+ border: 1px solid var(--content-border-color);+ max-width: calc(+ var(--topic-body-width) + (var(--topic-body-width-padding) * 2) + 1.3em+ );@include viewport.from(sm) {- padding-left: calc(- 48px - var(--pm-padding)- ); // 48px is the width of the avatar- }-- section {- border: none;- background: var(--primary-very-low);- padding-inline: var(--pm-padding);-- &:first-of-type {- border-radius: var(--d-border-radius) var(--d-border-radius) 0 0;- }-- &:last-of-type {- border-radius: 0 0 var(--d-border-radius) var(--d-border-radius);- }+ margin-left: calc(var(--pm-padding) + var(--space-1));}.map {padding-top: var(--pm-padding);}- &__contents,- &__additional-contents {- padding-top: var(--pm-padding);- }-&__contents {grid-area: contents;}@@ -148,18 +190,17 @@&__private-message-map {grid-area: pm-map;- padding: 0.5em var(--pm-padding) var(--pm-padding);+ padding: var(--space-2) var(--pm-padding) 0 0;}.participants {- margin-bottom: 1.5em;display: flex;flex-wrap: wrap;align-items: center;gap: var(--space-2);& + .controls {- margin-top: 0.5em;+ margin-top: var(--space-2);}&.hide-names .user {@@ -173,9 +214,7 @@@include ellipsis;display: flex;align-items: center;- background: var(--primary-low);border-radius: var(--d-border-radius);- padding-left: 0.65em;.user-link,.group-link {@@ -189,21 +228,22 @@}}+ .group-link {+ .d-icon {+ margin-left: var(--space-2);+ }+ }+.avatar,.d-icon-users {- margin-left: 0.25em;- margin-right: 0.25em;+ margin-left: var(--space-1);+ margin-right: var(--space-1);}.username,.group-name {- margin-right: 0.25em;- padding-block: 0.25em;- }-- .username:last-child,- .group-link:last-child {- margin-right: 0.65em;+ margin-right: var(--space-1);+ padding-block: var(--space-1);}&:last-child {@@ -216,7 +256,6 @@align-items: center;justify-content: center;align-self: stretch;- padding: 0 0.5em;box-sizing: border-box;border-radius: 0;}@@ -332,4 +371,10 @@}}}++ @include viewport.from(sm) {+ #topic-footer-buttons {+ padding-left: var(--space-6);+ }+ }}diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/_index.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/_index.scssindex 7ea56e5a376..15f75330081 100644--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/_index.scss+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/_index.scss@@ -11,4 +11,3 @@@import "calendar";@import "chat";@import "groups";-@import "personal-messages";diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scssindex 1fd582d7d21..bf058c4ddd7 100644--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/buttons-controls.scss@@ -28,6 +28,7 @@.topic-map__likes-trigger,.topic-map__users-trigger,.topic-map__links-trigger,+ .user,.notifications-tracking-btn,.user-menu-tab,.--with-description,diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/personal-messages.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/personal-messages.scssdeleted file mode 100644index 05379920eae..00000000000--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme/personal-messages.scss+++ /dev/null@@ -1,22 +0,0 @@-.uc-modernize-foundation-theme {- &.archetype-private_message .topic-map {- section {- border-radius: var(--d-border-radius);- padding: var(--space-4) var(--space-4) 0;- }-- .participants {- margin-bottom: 0;- padding-bottom: var(--space-4);-- .user {- border: var(--d-button-default-border);- background: var(--d-button-default-bg-color);-- .username:last-child {- margin-right: var(--space-1);- }- }- }- }-}diff --git a/frontend/discourse/app/components/topic-map/private-message-map.gjs b/frontend/discourse/app/components/topic-map/private-message-map.gjsindex 0f519fd801c..ac090544996 100644--- a/frontend/discourse/app/components/topic-map/private-message-map.gjs+++ b/frontend/discourse/app/components/topic-map/private-message-map.gjs@@ -4,6 +4,7 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { groupPath } from "discourse/lib/url";import DButton from "discourse/ui-kit/d-button";+import DUserLink from "discourse/ui-kit/d-user-link";import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";import dIcon from "discourse/ui-kit/helpers/d-icon";@@ -71,7 +72,7 @@ class PmMapUserGroup extends Component {}<template>- <div class="user group" data-id={{@model.id}}>+ <div class="user group btn-default" data-id={{@model.id}}><a href={{this.groupUrl}} class="group-link">{{dIcon "users"}}<span class="group-name">{{@model.name}}</span>@@ -94,7 +95,7 @@ class PmRemoveGroupLink extends Component {<template><DButton- class="remove-invited btn-small"+ class="btn-transparent remove-invited btn-small"@action={{this.removeGroup}}@icon="xmark"/>@@ -115,22 +116,20 @@ class PmMapUser extends Component {}<template>- <div class="user" data-id={{@model.id}}>- <a class="user-link" href={{@model.path}}>- <a- class="trigger-user-card"- data-user-card={{@model.username}}- title={{@model.username}}- aria-hidden="true"- >- {{dBoundAvatarTemplate- @model.avatar_template- "tiny"- (hash title=this.avatarTitle)- }}- </a>+ <div class="user btn-default" data-id={{@model.id}}>+ <DUserLink+ class="user-link trigger-user-card"+ @username={{@model.username}}+ @href={{@model.path}}+ title={{@model.username}}+ >+ {{dBoundAvatarTemplate+ @model.avatar_template+ "tiny"+ (hash title=this.avatarTitle)+ }}<span class="username">{{@model.username}}</span>- </a>+ </DUserLink>{{#if this.canRemoveLink}}<PmRemoveLink@@ -151,7 +150,7 @@ class PmRemoveLink extends Component {<template><DButton- class="remove-invited btn-small"+ class="btn-transparent remove-invited btn-small"@action={{this.removeUser}}@icon="xmark"/>