Merge branch 'master' of honey.fitz.guru:urge-app

This commit is contained in:
2018-03-06 21:21:42 -05:00
2 changed files with 12 additions and 1 deletions

View File

@@ -18,7 +18,7 @@
<ion-content> <ion-content>
<ion-list> <ion-list>
<ion-item class="message-bubble" *ngFor="let message of this.profile.messages" [ngClass]="{ 'user': (message.isUser == true) }"> <ion-item class="message-bubble" *ngFor="let message of this.profile.messages" [ngClass]="{ 'is-user': (message.isUser == true) }">
<img *ngIf="message.image" [src]="message.image" (press)="showLightbox($event, message.image)"> <img *ngIf="message.image" [src]="message.image" (press)="showLightbox($event, message.image)">
<p *ngIf="message.text != ''">{{message.text}}</p> <p *ngIf="message.text != ''">{{message.text}}</p>
</ion-item> </ion-item>

View File

@@ -1,3 +1,14 @@
page-chat { page-chat {
.message-bubble {
background-color: #000fff;
color: #000000;
max-width: 75%;
padding: 0.75rem;
&.is-user {
background-color: #fff000;
margin: 1rem 0 1rem auto;
}
}
} }