From 8e98480020e04bbb174d9338987914cb024e8061 Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Thu, 15 May 2025 12:00:26 +0200 Subject: [PATCH 1/7] UX: add discourse-text icon for composer --- lib/svg_sprite.rb | 1 + vendor/assets/svg-icons/discourse-additional.svg | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb index be7b013294e50..f895fd670312b 100644 --- a/lib/svg_sprite.rb +++ b/lib/svg_sprite.rb @@ -92,6 +92,7 @@ module SvgSprite discourse-sidebar discourse-sparkles discourse-table + discourse-text discourse-threads discourse-add-translation download diff --git a/vendor/assets/svg-icons/discourse-additional.svg b/vendor/assets/svg-icons/discourse-additional.svg index fa8f663f32cfe..dece8040adfab 100644 --- a/vendor/assets/svg-icons/discourse-additional.svg +++ b/vendor/assets/svg-icons/discourse-additional.svg @@ -95,4 +95,8 @@ Additional SVG icons + + + + From af6c00d733ff4287be9d44d4e8e63c54e8b8344c Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Fri, 16 May 2025 20:32:19 +0200 Subject: [PATCH 2/7] UX: remove blurbs, adjust sizing --- .../javascripts/discourse/app/components/composer-messages.gjs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.gjs b/app/assets/javascripts/discourse/app/components/composer-messages.gjs index 68264fc98ff3f..7e0cf7904a5d3 100644 --- a/app/assets/javascripts/discourse/app/components/composer-messages.gjs +++ b/app/assets/javascripts/discourse/app/components/composer-messages.gjs @@ -239,6 +239,9 @@ export default class ComposerMessages extends Component { this.similarTopics.pushObjects(topics.content); if (this.similarTopics.length > 0) { + if (this.similarTopics.length > 2) { + this.similarTopics = this.similarTopics.slice(0, 3); + } this._similarTopicsMessage.set("similarTopics", this.similarTopics); this.popup(this._similarTopicsMessage); } else if (this._similarTopicsMessage) { From b9714ad271c4c1cc93e65d00f58422e07f7740d7 Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Fri, 16 May 2025 20:32:30 +0200 Subject: [PATCH 3/7] DEV: limit to 3 similar topics --- .../stylesheets/common/base/compose.scss | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 2e7dd5a78b364..d85e9dec43809 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -1026,16 +1026,25 @@ div.ac-wrap { .composer-popup { box-sizing: border-box; position: absolute; - width: calc(50% - 16px); - top: 19px; // grippie (11px) + .reply-area padding (8px) - bottom: 8px; - right: 8px; + width: calc(60%); + max-height: 50%; + bottom: 3.7rem; + right: 1rem; overflow-y: auto; z-index: z("composer", "dropdown") + 1; - padding: 1.5em; + padding: 1.5em 1.5rem 0.75em 1.5rem; box-shadow: var(--shadow-dropdown); background: var(--highlight-bg); + .show-preview & { + bottom: 3.2rem; + width: calc(50% - 16px); + } + + .blurb { + display: none; + } + > p, h3 { &:first-of-type { @@ -1169,6 +1178,9 @@ div.ac-wrap { .first-line { flex: 1; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } .second-line { From b6ab6ae2a3c0425ccfd2bb1ecb3ffc234d2bf4af Mon Sep 17 00:00:00 2001 From: David Battersby Date: Mon, 19 May 2025 12:37:59 +0400 Subject: [PATCH 4/7] small js tidyup --- .../discourse/app/components/composer-messages.gjs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.gjs b/app/assets/javascripts/discourse/app/components/composer-messages.gjs index 7e0cf7904a5d3..b593e0c4ce76b 100644 --- a/app/assets/javascripts/discourse/app/components/composer-messages.gjs +++ b/app/assets/javascripts/discourse/app/components/composer-messages.gjs @@ -236,12 +236,9 @@ export default class ComposerMessages extends Component { } this.similarTopics.clear(); - this.similarTopics.pushObjects(topics.content); + this.similarTopics.pushObjects(topics.content.slice(0, 3)); if (this.similarTopics.length > 0) { - if (this.similarTopics.length > 2) { - this.similarTopics = this.similarTopics.slice(0, 3); - } this._similarTopicsMessage.set("similarTopics", this.similarTopics); this.popup(this._similarTopicsMessage); } else if (this._similarTopicsMessage) { From 25ea251bed50b9bf0d3094e6fb1834ca8cbcd201 Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Tue, 20 May 2025 14:14:04 +0200 Subject: [PATCH 5/7] remove JS in favour of global setting change --- .../javascripts/discourse/app/components/composer-messages.gjs | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.gjs b/app/assets/javascripts/discourse/app/components/composer-messages.gjs index 7e0cf7904a5d3..68264fc98ff3f 100644 --- a/app/assets/javascripts/discourse/app/components/composer-messages.gjs +++ b/app/assets/javascripts/discourse/app/components/composer-messages.gjs @@ -239,9 +239,6 @@ export default class ComposerMessages extends Component { this.similarTopics.pushObjects(topics.content); if (this.similarTopics.length > 0) { - if (this.similarTopics.length > 2) { - this.similarTopics = this.similarTopics.slice(0, 3); - } this._similarTopicsMessage.set("similarTopics", this.similarTopics); this.popup(this._similarTopicsMessage); } else if (this._similarTopicsMessage) { From ce019e3fa15774963e0d5e9dba3096c9ea063599 Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Tue, 20 May 2025 14:17:16 +0200 Subject: [PATCH 6/7] remove --- .../javascripts/discourse/app/components/composer-messages.gjs | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.gjs b/app/assets/javascripts/discourse/app/components/composer-messages.gjs index b593e0c4ce76b..d46d6d9018922 100644 --- a/app/assets/javascripts/discourse/app/components/composer-messages.gjs +++ b/app/assets/javascripts/discourse/app/components/composer-messages.gjs @@ -236,7 +236,6 @@ export default class ComposerMessages extends Component { } this.similarTopics.clear(); - this.similarTopics.pushObjects(topics.content.slice(0, 3)); if (this.similarTopics.length > 0) { this._similarTopicsMessage.set("similarTopics", this.similarTopics); From 75765155adb8c7cb41634487a42d86a1e314cfbd Mon Sep 17 00:00:00 2001 From: chapoi <101828855+chapoi@users.noreply.github.com> Date: Tue, 20 May 2025 14:18:22 +0200 Subject: [PATCH 7/7] removed too much --- .../javascripts/discourse/app/components/composer-messages.gjs | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.gjs b/app/assets/javascripts/discourse/app/components/composer-messages.gjs index d46d6d9018922..68264fc98ff3f 100644 --- a/app/assets/javascripts/discourse/app/components/composer-messages.gjs +++ b/app/assets/javascripts/discourse/app/components/composer-messages.gjs @@ -236,6 +236,7 @@ export default class ComposerMessages extends Component { } this.similarTopics.clear(); + this.similarTopics.pushObjects(topics.content); if (this.similarTopics.length > 0) { this._similarTopicsMessage.set("similarTopics", this.similarTopics);