aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2024-03-17 11:01:27 +0000
committerMario <mario@mariovavti.com>2024-03-17 11:01:27 +0000
commit2114779037637115870b9a44cd9dea8382531ae2 (patch)
tree2659b0d0e0e1ca9b72a93853586a82a9fac442af
parent9600789d6be3fc3e8ed0803f1d80d5dbf0dd4779 (diff)
parent937b6d360e7f37e89102eaa7421acb61bc856c99 (diff)
downloadvolse-hubzilla-2114779037637115870b9a44cd9dea8382531ae2.tar.gz
volse-hubzilla-2114779037637115870b9a44cd9dea8382531ae2.tar.bz2
volse-hubzilla-2114779037637115870b9a44cd9dea8382531ae2.zip
Merge branch 'dev' into 9.0RC
-rw-r--r--Zotlabs/Lib/Activity.php2
-rw-r--r--view/css/conversation.css2
2 files changed, 3 insertions, 1 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 c989810e3..6958e9bf2 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -194,7 +194,7 @@ a.wall-item-name-link {
}
.ivoted {
- color: #007bff;
+ color: var(--bs-primary);
}
.item-highlight {