From 82619c2445b2ad2b97feb141ade1b30569db1e40 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 7 Mar 2018 10:27:18 +0800 Subject: [PATCH] FIX: Missing messages incoming indicator for mobile. --- .../mobile/components/basic-topic-list.hbs | 9 +++++++++ app/assets/stylesheets/common/base/user.scss | 1 - app/assets/stylesheets/desktop/user.scss | 4 ++++ app/assets/stylesheets/mobile/user.scss | 16 ++++++++-------- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs index b0a3dbe21e8..6fe4c5d48cf 100644 --- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs @@ -1,4 +1,13 @@ {{#conditional-loading-spinner condition=loading}} + {{#if hasIncoming}} +
+
+ {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}} + {{i18n 'click_to_show'}} +
+
+ {{/if}} + {{#if topics}} diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index ba4ccf5c094..2eae6df77c8 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -13,7 +13,6 @@ } .show-mores { - position: absolute; width: 100%; } } diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 38c4c87b9ad..a7ac7803c32 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -8,6 +8,10 @@ margin-top: 10px; } } + + .show-mores { + position: absolute; + } } .profile-image { diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index 7a652d99046..09df789b5aa 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -143,20 +143,20 @@ display: flex; flex: 1 1 auto; flex-wrap: wrap; - + } li { display: flex; - flex: 1 1 auto; - margin: 0 5px; + flex: 1 1 auto; + margin: 0 5px; } span { flex: 0 1 100%; - margin: 0 5px; + margin: 0 5px; } - + .user-profile-controls-outlet { margin: 0; li { @@ -165,7 +165,7 @@ } a { - flex: 1 1 auto; + flex: 1 1 auto; min-width: 120px; } } @@ -214,7 +214,7 @@ } .stats-section { - li { + li { margin: 0 15px 10px 0; padding: 0; &.linked-stat { @@ -277,7 +277,7 @@ .checkbox-label { display: flex; - overflow: auto; + overflow: auto; width: 100%; padding: 5px 0; input {