From 35145b9677a8de836830c1c6fcd431e4b53e0081 Mon Sep 17 00:00:00 2001
From: Niko <niko@nobigtech.es>
Date: Tue, 15 Feb 2022 18:41:33 +0100
Subject: [PATCH] Changed default color for meet.item text background + little
 UI changes

---
 web/src/_templates/app/header.php       | 7 ++++++-
 web/src/app/css/app.css                 | 5 ++---
 web/src/app/js/pages/meet.js            | 4 ++--
 web/src/app/js/templates/meet/item.html | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/web/src/_templates/app/header.php b/web/src/_templates/app/header.php
index 3ef2281..18bc113 100644
--- a/web/src/_templates/app/header.php
+++ b/web/src/_templates/app/header.php
@@ -25,7 +25,12 @@
 		vars: {
 			app_dir: '<?php echo APP_DIR ?>',
 			js_dir: '<?php echo APP_DIR ?>/js',
-			default_icon: '/assets/images/default_profile.png',
+			defaults: {
+				icon: '/assets/images/default_profile.png',
+				meet: {
+					text_bgcolor: '#93227ce8',
+				},
+			},
 		},
 	}; </script>
 	<?php tpl_scripts(['base', 'navmenu', 'carousel', 'app']) ?>
diff --git a/web/src/app/css/app.css b/web/src/app/css/app.css
index df6e296..7777f0f 100644
--- a/web/src/app/css/app.css
+++ b/web/src/app/css/app.css
@@ -126,7 +126,7 @@ main {
 .meet.item .status { color: #fff }
 .meet.item .status-content {
 	padding: 1em;
-	box-shadow: 0px 0px 1em #0000008c;
+	box-shadow: 0px 2px 1px #0000008c;
 	margin-bottom: 1em;
 }
 .meet.item .status-content .text {
@@ -135,8 +135,7 @@ main {
 	font-size: 1.2em;
 	word-break: break-word;
 }
-.meet.item .status-content pre {
-	font-family: inherit !important;
+.meet.item .status-content .text p {
 	margin: 0 !important;
 }
 .meet.item .status .profile { padding: 1em 2em; }
diff --git a/web/src/app/js/pages/meet.js b/web/src/app/js/pages/meet.js
index d7f4145..c026990 100644
--- a/web/src/app/js/pages/meet.js
+++ b/web/src/app/js/pages/meet.js
@@ -15,13 +15,13 @@ app.pages.meet = {
 							if (k === 'date') return dayjs(parseInt(v)).fromNow(true);
 						});
 						var item = json[i];
-						var icon = app.vars.default_icon;
+						var icon = app.vars.defaults.icon;
 						if (item.account.avatar !== undefined &&
 							item.account.avatar.length > 0)
 							icon = item.account.avatar[0].url[0];
 						var textClr = item.text_color;
 						if (textClr === undefined)
-							textClr = '#00000094';
+							textClr = app.vars.defaults.meet.text_bgcolor;
 						tpl = tpl.replaceAll('{avatar}', htmlescape(icon));
 						tpl = tpl.replaceAll('{actionsHeight}', '6em');
 						tpl = tpl.replaceAll('{textColor}', htmlescape(textClr));
diff --git a/web/src/app/js/templates/meet/item.html b/web/src/app/js/templates/meet/item.html
index 98da38f..f6c9c46 100644
--- a/web/src/app/js/templates/meet/item.html
+++ b/web/src/app/js/templates/meet/item.html
@@ -22,7 +22,7 @@
 				</div>
 				<div class="status-content center width-max"
 					style="background: {textColor};">
-					<div class="text"><pre>{.text}</pre></div>
+					<div class="text"><p>{.text}</p></div>
 				</div>
 			</div>
 			<div class="profile flex">