Merge pull request #123 from rpaschoal/2.0.3

Merge from 2.0.3
rpaschoal · Apr 27, 2019 · e62416a · e62416a
2 parents 17dcfab + 5f79665
commit e62416a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/demo/offline_bot/package.json b/demo/offline_bot/package.json
@@ -24,7 +24,7 @@
     "core-js": "^2.5.7",
     "rxjs": "^6.3.3",
     "zone.js": "^0.8.26",
-    "ng-chat": "^2.0.2"
+    "ng-chat": "^2.0.3"
   },
   "devDependencies": {
     "@angular/cli": "^7.0.4",

diff --git a/src/ng-chat/assets/themes/ng-chat.theme.dark.scss b/src/ng-chat/assets/themes/ng-chat.theme.dark.scss
@@ -3,7 +3,7 @@ $secondary-color: #444;
 $text-color: #FFF;
 
 %text-definition {
-    color: #FFF;
+    color: $text-color;
     font-family: Arial, Helvetica, sans-serif;
 }
 
@@ -35,7 +35,7 @@ $text-color: #FFF;
     }
     .unread-messages-counter-container, .ng-chat-people-action, .ng-chat-people-action > i
     {
-        background-color: #FFF;
+        background-color: $text-color;
         color: $secondary-color;
     }
     .load-history-action
@@ -45,7 +45,7 @@ $text-color: #FFF;
     .chat-window-input
     {
         background-color: $secondary-color;
-        color: #FFF;
+        color: $text-color;
     }
     .sent-chat-message-container, .file-message-container
     {
@@ -61,4 +61,8 @@ $text-color: #FFF;
     {
         background-color: $secondary-color;
     }
+    .ng-chat-message a 
+    {
+        color: $text-color;
+    }
 }
diff --git a/src/ng-chat/ng-chat.component.html b/src/ng-chat/ng-chat.component.html
@@ -79,9 +79,7 @@
                     </ng-container>
                     <ng-container [ngSwitch]="message.type">
                         <div *ngSwitchCase="MessageType.Text" [ngClass]="{'sent-chat-message-container': message.fromId == userId, 'received-chat-message-container': message.fromId != userId}">
-                            <span>
-                                {{message.message | emojify:emojisEnabled | linkfy:linkfyEnabled}}
-                            </span>
+                            <span [innerHtml]="message.message | emojify:emojisEnabled | linkfy:linkfyEnabled"></span>
                             <span *ngIf="showMessageDate && message.dateSent" class="message-sent-date">{{message.dateSent | date:messageDatePipeFormat}}</span>
                         </div>
                         <div *ngSwitchCase="MessageType.File" [ngClass]="{'file-message-container': true, 'received': message.fromId != userId}">

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-chat",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "peerDependencies": {
     "@angular/common": "*",
     "@angular/core": "*",