Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

4 files changed, 25 insertions, 30 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index f6ceaeca9..603155e7c 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -3559,10 +3559,12 @@ class Activity {
 			'ostatus'          => 'http://ostatus.org#',
 			'diaspora'         => 'https://diasporafoundation.org/ns/',
 			'litepub'          => 'http://litepub.social/ns#',
+			'toot'             => 'http://joinmastodon.org/ns#',
 
 			'commentPolicy'    => 'zot:commentPolicy',
 			'Bookmark'         => 'zot:Bookmark',
 			'Category'         => 'zot:Category',
+			'Emoji'            => 'toot:Emoji',
 
 			'directMessage'    => 'litepub:directMessage',
 
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 54b12ac16..6958e9bf2 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -52,7 +52,7 @@
 #profile-jot-text {
 	resize: none;
 	border-width: 0px;
-	height: 2.5rem;
+	height: 2.7rem;
 	line-height: 1.5rem;
 	padding: 0.5rem;
 	width: 100%;
@@ -137,6 +137,10 @@ a.wall-item-name-link {
 	font-weight: bold !important;
 }
 
+.wall-item-ago i {
+	font-size: 0.875em
+}
+
 .wall-item-ago .fa-check {
 	cursor: pointer;
 }
@@ -190,7 +194,7 @@ a.wall-item-name-link {
 }
 
 .ivoted {
-	color: #007bff;
+	color: var(--bs-primary);
 }
 
 .item-highlight {
@@ -300,9 +304,9 @@ code.inline-code {
 }
 
 img.emoji {
-	height: 1rem;
+	height: 1.2rem;
 	vertical-align: baseline;
-	margin-bottom: -.1rem;
+	margin-bottom: -.2rem;
 }
 
 img.emoji.single-emoji {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9b93e28ee..baadd7843 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -76,27 +76,27 @@ main {
 }
 
 h1, .h1 {
-	font-size: 2rem;
+	font-size: 2.1rem;
 }
 
 h2, .h2 {
-	font-size: 1.6rem;
+	font-size: 1.7rem;
 }
 
 h3, .h3 {
-	font-size: 1.2rem;
+	font-size: 1.3rem;
 }
 
 h4, .h4 {
-	font-size: 1.05rem;
+	font-size: 1.15rem;
 }
 
 h5, .h5 {
-	font-size: 0.9rem;
+	font-size: 1rem;
 }
 
 h6, .h6 {
-	font-size: 0.75rem;
+	font-size: 0.85rem;
 }
 
 .navbar-banner {
@@ -141,7 +141,7 @@ a:focus,
 }
 
 input, optgroup, select, textarea {
-	font-size: 0.9rem !important;
+	font-size: 1rem !important;
 }
 
 input[type=text], textarea {
@@ -730,7 +730,7 @@ div.jGrowl div.jGrowl-notification {
 
 .jslider .jslider-scale ins {
 	color: #333;
-	font-size: 0.9rem;
+	font-size: 1rem;
 	width: 100px;
 	text-align: center;
 }
@@ -948,17 +948,14 @@ img.mail-conv-sender-photo {
 	background-color: var(--bs-body-bg);
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
-
 }
 
-
-
 #profile-jot-text::-webkit-input-placeholder {
-	font-size: 1.2rem;
+	font-size: 1.3rem;
 }
 
 #profile-jot-text::-moz-placeholder {
-	font-size: 1.2rem;
+	font-size: 1.3rem;
 }
 
 #profile-jot-text:focus::-webkit-input-placeholder {
@@ -1047,14 +1044,6 @@ img.mail-conv-sender-photo {
 	height: $reply_photo;
 }
 
-.wall-item-content,
-.mail-conv-body,
-.page-body,
-.chat-item-text,
-.chat-item-text-self {
-	font-size: 1rem;
-}
-
 .comment-edit-text {
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
@@ -1141,8 +1130,8 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-2 {
-	height: 2.3rem;
-	width: 2.3rem;
+	height: 2.5rem;
+	width: 2.5rem;
 	margin-right: .5rem;
 	border-radius: var(--bs-border-radius);
 	float: left;
@@ -1185,6 +1174,7 @@ img.mail-conv-sender-photo {
 	border: 1px solid var(--bs-border-color);
 	border-radius: var(--bs-border-radius);
 	margin-bottom: 1.5rem;
+	font-size: 1.1rem;
 }
 
 .section-title-wrapper {
@@ -1341,7 +1331,6 @@ main.fullscreen .section-content-wrapper-np {
 /* bootstrap overrides */
 
 blockquote {
-	font-size: 1rem;
 	font-style: italic;
 	border-left: 3px solid var(--bs-border-color);
 	padding: 1em 0px 1em 1.5em;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 056cea1cd..63d3b4bf9 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -100,8 +100,8 @@ $background_image = $background_image ?: '';
 $background_image_dark = $background_image_dark ?: '';
 $font_size = $font_size ?: '0.875rem';
 $converse_width = $converse_width ?: '52'; //unit: rem
-$top_photo = $top_photo ?: '2.3rem';
-$reply_photo = $reply_photo ?: '2.3rem';
+$top_photo = $top_photo ?: '2.9rem';
+$reply_photo = $reply_photo ?: '2.9rem';
 
 // Apply the settings
 if(file_exists('view/theme/redbasic/css/style.css')) {