Merge branch 'master' of Software_Engineering_I/greenvironment-frontend into max_dev

master
Max_ES 5 years ago committed by Gitea
commit d37371910d

@ -27,7 +27,7 @@
<mat-card-actions>
<div *ngIf="post.activity" class="activity-info" fxHide.gt-sm="true">
<span class="span" [matTooltip]="post.activity.description" matTooltipShowDelay="200">
{{post.activity.points}} points earned through <b>{{post.activity.name}}</b>
+{{post.activity.points}} points with <b>{{post.activity.name}}</b>
</span>
</div>
<div class="postVoteButtons">
@ -44,7 +44,7 @@
</div>
<div *ngIf="post.activity" class="activity-info" fxHide.lt-md="true">
<span class="span" [matTooltip]="post.activity.description" matTooltipShowDelay="200">
{{post.activity.points}} points earned through <b>{{post.activity.name}}</b>
{{post.activity.points}} points earned with <b>{{post.activity.name}}</b>
</span>
</div>
</mat-card-actions>

@ -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
@ -32,6 +33,9 @@ $mat-card-header-size: 40px !default
text-decoration: underline
cursor: pointer
.postlistUsername
cursor: pointer
.postVoteButtons
display: inline-block
@ -60,8 +64,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%
@ -87,7 +90,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
@ -101,7 +103,7 @@ $mat-card-header-size: 40px !default
scale: 1.1
.mat-card-actions
display: flex
display: -webkit-box
justify-content: end
align-items: center

@ -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);
}
});

Loading…
Cancel
Save