FIX: Don't cut browse more message on the mobile app. (#22998)

Adds a padding-bottom to the wrapper to avoid cutting the message on the mobile app and sets a max-width to align with the timeline on the desktop.

Fixes a bug on mobile where we updated the preference, but the user had a single list.
This commit is contained in:
Roman Rizzi 2023-08-07 17:19:21 -03:00 committed by GitHub
parent a38830c009
commit 2485f5d5f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 30 deletions

View File

@ -1,7 +1,4 @@
<div <div class="more-content-wrapper" {{did-insert this.buildListPills}}>
class="more-content-wrapper {{if this.singleList 'single-list'}}"
{{did-insert this.buildListPills}}
>
{{#if this.showTopicListsNav}} {{#if this.showTopicListsNav}}
<div class="row"> <div class="row">
<ul class="nav nav-pills" {{did-insert this.buildListPills}}> <ul class="nav nav-pills" {{did-insert this.buildListPills}}>
@ -19,27 +16,33 @@
</div> </div>
{{/if}} {{/if}}
{{#if @topic.relatedMessages.length}} <div class="more-topics-lists {{if this.singleList 'single-list'}}">
<RelatedMessages @topic={{@topic}} /> {{#if @topic.relatedMessages.length}}
{{/if}} <RelatedMessages @topic={{@topic}} />
{{/if}}
{{#if @topic.suggestedTopics.length}}
<SuggestedTopics @topic={{@topic}} />
<span>
<PluginOutlet
@name="below-suggested-topics"
@connectorTagName="div"
@outletArgs={{hash topic=@topic}}
/>
</span>
{{/if}}
<PluginOutlet
@name="topic-more-content"
@outletArgs={{hash model=@topic}}
/>
</div>
{{#if @topic.suggestedTopics.length}} {{#if @topic.suggestedTopics.length}}
<SuggestedTopics @topic={{@topic}} /> <h3 class="suggested-topics-message">
{{html-safe this.browseMoreMessage}}
<span> </h3>
<PluginOutlet
@name="below-suggested-topics"
@connectorTagName="div"
@outletArgs={{hash topic=@topic}}
/>
</span>
{{/if}} {{/if}}
</div>
<PluginOutlet @name="topic-more-content" @outletArgs={{hash model=@topic}} />
</div>
{{#if @topic.suggestedTopics.length}}
<h3 class="suggested-topics-message">
{{html-safe this.browseMoreMessage}}
</h3>
{{/if}}

View File

@ -13,8 +13,8 @@ export default class MoreTopicsPreferenceTracking extends Service {
this.preference = this.keyValueStore.get(TOPIC_LIST_PREFERENCE_KEY); this.preference = this.keyValueStore.get(TOPIC_LIST_PREFERENCE_KEY);
} }
updatePreference(value, rememberPref = false) { updatePreference(value, rememberPref = true) {
if (!rememberPref) { if (rememberPref) {
this.keyValueStore.set({ key: TOPIC_LIST_PREFERENCE_KEY, value }); this.keyValueStore.set({ key: TOPIC_LIST_PREFERENCE_KEY, value });
} }

View File

@ -397,6 +397,10 @@ a.badge-category {
max-width: 150px; max-width: 150px;
} }
.more-content-wrapper {
padding-bottom: max(env(safe-area-inset-bottom), 1em);
}
.more-content-topics { .more-content-topics {
.topic-list-body { .topic-list-body {
border-top: none; border-top: none;

View File

@ -362,7 +362,11 @@ pre.codeblock-buttons:hover {
} }
} }
.more-content-wrapper.single-list { .more-content-wrapper {
max-width: calc(var(--d-max-width) * 0.87);
}
.more-topics-lists.single-list {
.more-content-topics { .more-content-topics {
width: 100%; width: 100%;
} }

View File

@ -136,7 +136,7 @@
} }
} }
.more-content-wrapper { .more-topics-lists {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
clear: both; clear: both;

View File

@ -252,7 +252,7 @@ a.reply-to-tab {
} }
} }
.more-content-wrapper { .more-topics-lists {
&:not(.single-list) { &:not(.single-list) {
.more-topics-title { .more-topics-title {
display: none; display: none;