From f50ae07560546afc50a10eae63c5e9395db968e1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Nov 2017 09:01:57 +0100
Subject: fix notifications again after recent changes

---
 view/tpl/notifications_widget.tpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 29892ba79..0095b8b85 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -26,7 +26,6 @@
 	}
 </style>
 
-{{if $module == 'display'}}
 <script>
 	var notifications_parent;
 	$(document).ready(function() {
@@ -44,6 +43,7 @@
 		});
 	});
 
+	{{if $module == 'display'}}
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
@@ -60,11 +60,12 @@
 			liveUpdate();
 
 			if($('#notifications_wrapper').hasClass('fs'))
-				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); //var notifications_parent is defined in redbasic.js
+				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
 		}
 	});
+	{{/if}}
 </script>
-{{/if}}
+
 
 {{if $notifications}}
 <div id="notifications_wrapper">
-- 
cgit v1.2.3


From ed0d7890abaf5566b8d5d71f689d750b87b79dec Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Nov 2017 09:07:33 +0100
Subject: move notifications style to widgets.css

---
 view/tpl/notifications_widget.tpl | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'view/tpl/notifications_widget.tpl')

diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0095b8b85..3ef7bff7d 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -1,31 +1,3 @@
-<style>
-	.notification-content {
-		max-height: 70vh;
-		overflow: auto;
-	}
-
-	.notification-content.collapsing {
-		overflow: hidden;
-	}
-
-	.fs {
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		padding: 4.5rem .5rem 1rem .5rem;
-		background-color: white;
-		width: 100%;
-		max-width: 100%;
-		height: 100%;
-		z-index: 1029;
-		overflow: auto;
-	}
-
-	#notifications {
-		margin-bottom: 1rem;
-	}
-</style>
-
 <script>
 	var notifications_parent;
 	$(document).ready(function() {
-- 
cgit v1.2.3