From a6acf480a78284a423479310727ecd1dc64f0326 Mon Sep 17 00:00:00 2001 From: trivernis Date: Mon, 20 Jan 2020 17:46:21 +0100 Subject: [PATCH 1/3] Fix mobile layout for Chrome Mobile --- .../components/feed/postlist/postlist.component.html | 4 ++-- .../components/feed/postlist/postlist.component.sass | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/components/feed/postlist/postlist.component.html b/src/app/components/feed/postlist/postlist.component.html index 96e01cd..a323d42 100644 --- a/src/app/components/feed/postlist/postlist.component.html +++ b/src/app/components/feed/postlist/postlist.component.html @@ -27,7 +27,7 @@
- {{post.activity.points}} points earned through {{post.activity.name}} + +{{post.activity.points}} points with {{post.activity.name}}
@@ -44,7 +44,7 @@
- {{post.activity.points}} points earned through {{post.activity.name}} + {{post.activity.points}} points earned with {{post.activity.name}}
diff --git a/src/app/components/feed/postlist/postlist.component.sass b/src/app/components/feed/postlist/postlist.component.sass index b6ef195..f071c7a 100644 --- a/src/app/components/feed/postlist/postlist.component.sass +++ b/src/app/components/feed/postlist/postlist.component.sass @@ -27,11 +27,13 @@ $mat-card-header-size: 40px !default margin: 0 .postlistUsername, a - cursor: pointer margin-right: 0.4em &:hover text-decoration: underline + .postlistUsername + cursor: pointer + .postVoteButtons display: inline-block @@ -57,8 +59,7 @@ $mat-card-header-size: 40px !default .mat-button min-width: 32px !important padding: 0 - margin: 0 - margin-left: 8px + margin: 0 0 0 8px .profile-picture border-radius: 50% @@ -84,7 +85,6 @@ $mat-card-header-size: 40px !default @media (max-width: 959px) .activity-info > .span margin-left: 1em - width: calc(100% - 1em) display: block text-align: left .postVoteButtons @@ -98,7 +98,7 @@ $mat-card-header-size: 40px !default scale: 1.1 .mat-card-actions - display: flex + display: -webkit-box justify-content: end align-items: center From 55252f30572a694de3ea42ea65a9006f0153dfee Mon Sep 17 00:00:00 2001 From: trivernis Date: Mon, 20 Jan 2020 18:09:58 +0100 Subject: [PATCH 2/3] Fix (potentially) x-scrollbar showing --- src/app/components/feed/postlist/postlist.component.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/components/feed/postlist/postlist.component.sass b/src/app/components/feed/postlist/postlist.component.sass index 0dc250e..7c486e9 100644 --- a/src/app/components/feed/postlist/postlist.component.sass +++ b/src/app/components/feed/postlist/postlist.component.sass @@ -8,6 +8,7 @@ $mat-card-header-size: 40px !default margin-top: 0.5em outline: none user-select: none + overflow-x: hidden ::ng-deep .mat-card-header-text margin-top: 10px From aa18bc191c459939f566532bfc11cb8c5f05fddf Mon Sep 17 00:00:00 2001 From: trivernis Date: Mon, 20 Jan 2020 18:23:27 +0100 Subject: [PATCH 3/3] Fix loading still shown when no posts are available --- src/app/services/feed/feed.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index 62aea92..1689b91 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -257,7 +257,7 @@ export class FeedService extends BaseService { } } this.posts.next(posts); - if (posts.length < this.offsetStep) { + if (response.data.getPosts.length < this.offsetStep) { this.postsAvailable.next(false); } });