From 042f66851b6a4ea74b14e0f3b524a0d6943c474e Mon Sep 17 00:00:00 2001
From: Matthieu H <matthieu@sociallymap.com>
Date: Fri, 10 Nov 2017 15:08:45 +0100
Subject: [PATCH 1/2] Fix: clickIconToClose

---
 src/components/notification/notification.component.html | 2 +-
 src/components/notification/notification.component.ts   | 3 ++-
 src/services/notifications.service.ts                   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/notification/notification.component.html b/src/components/notification/notification.component.html
index db8c3d1..68afb27 100644
--- a/src/components/notification/notification.component.html
+++ b/src/components/notification/notification.component.html
@@ -32,7 +32,7 @@
             <div class="sn-content" [innerHTML]="content"></div>
         </ng-template>
 
-        <div class="icon" *ngIf="item.icon !== 'bare'" [innerHTML]="safeSvg"></div>
+        <div class="icon" [class.icon-hover]="clickIconToClose" *ngIf="item.icon !== 'bare'" [innerHTML]="safeSvg" (click)="onClickIcon($event)"></div>
     </div>
     <div *ngIf="item.html">
         <div class="sn-content" [innerHTML]="item.html"></div>
diff --git a/src/components/notification/notification.component.ts b/src/components/notification/notification.component.ts
index 89c4b95..996b7a0 100644
--- a/src/components/notification/notification.component.ts
+++ b/src/components/notification/notification.component.ts
@@ -153,6 +153,7 @@ export class NotificationComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit(): void {
+    console.log('wesh');
     if (this.item.override) {
       this.attachOverrides();
     }
@@ -194,7 +195,7 @@ export class NotificationComponent implements OnInit, OnDestroy {
   onClick($e: MouseEvent): void {
     this.item.click!.emit($e);
 
-    if (this.clickToClose) {
+    if (this.clickToClose && !this.clickIconToClose) {
       this.remove();
     }
   }
diff --git a/src/services/notifications.service.ts b/src/services/notifications.service.ts
index 47634d2..5fa24c5 100644
--- a/src/services/notifications.service.ts
+++ b/src/services/notifications.service.ts
@@ -13,6 +13,7 @@ export class NotificationsService {
     set(notification: Notification, to: boolean): Notification {
         notification.id = notification.override && notification.override.id ? notification.override.id : Math.random().toString(36).substring(3);
         notification.click = new EventEmitter<{}>();
+        notification.clickIcon = new EventEmitter<{}>();
 
         this.emitter.next({command: 'set', notification: notification, add: to});
         return notification;

From 5978f2a3bf849ebccb2e4f1db5823e94bd66ee81 Mon Sep 17 00:00:00 2001
From: Matthieu H <matthieu@sociallymap.com>
Date: Fri, 10 Nov 2017 15:54:25 +0100
Subject: [PATCH 2/2] Add paddind to .sn-title & .sn-content only if has icon

---
 .../notification/notification.component.css     | 17 +++++++++++------
 .../notification/notification.component.html    |  3 ++-
 .../notification/notification.component.ts      |  1 -
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/notification/notification.component.css b/src/components/notification/notification.component.css
index d8960f2..b54fe14 100644
--- a/src/components/notification/notification.component.css
+++ b/src/components/notification/notification.component.css
@@ -13,18 +13,22 @@
 
 .simple-notification .sn-title {
     margin: 0;
-    padding: 0 50px 0 0;
     line-height: 30px;
     font-size: 20px;
 }
 
+
 .simple-notification .sn-content {
     margin: 0;
     font-size: 16px;
-    padding: 0 50px 0 0;
     line-height: 20px;
 }
 
+.simple-notification.has-icon .sn-title,
+.simple-notification.has-icon .sn-content {
+    padding: 0 50px 0 0;
+}
+
 .simple-notification .icon {
     position: absolute;
     box-sizing: border-box;
@@ -49,12 +53,13 @@
     fill: #fff;
 }
 
-.simple-notification.rtl-mode {
-    direction: rtl;
+.simple-notification.rtl-mode.has-icon .sn-title,
+.simple-notification.rtl-mode.has-icon .sn-content {
+    padding: 0 0 0 50px;
 }
 
-.simple-notification.rtl-mode .sn-content {
-    padding: 0 0 0 50px;
+.simple-notification.rtl-mode {
+    direction: rtl;
 }
 
 .simple-notification.rtl-mode svg {
diff --git a/src/components/notification/notification.component.html b/src/components/notification/notification.component.html
index 68afb27..44f15e1 100644
--- a/src/components/notification/notification.component.html
+++ b/src/components/notification/notification.component.html
@@ -9,7 +9,8 @@
             'success': item.type === 'success',
             'info': item.type === 'info',
             'bare': item.type === 'bare',
-            'rtl-mode': rtl
+            'rtl-mode': rtl,
+            'has-icon': item.icon || (item.icon && item.icon !== 'bare')
         }"
      (mouseenter)="onEnter()"
      (mouseleave)="onLeave()">
diff --git a/src/components/notification/notification.component.ts b/src/components/notification/notification.component.ts
index 996b7a0..c661e2b 100644
--- a/src/components/notification/notification.component.ts
+++ b/src/components/notification/notification.component.ts
@@ -153,7 +153,6 @@ export class NotificationComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit(): void {
-    console.log('wesh');
     if (this.item.override) {
       this.attachOverrides();
     }