diff --git a/android/app/src/main/assets/public/icons.js b/android/app/src/main/assets/public/icons.js
index 9d419cd5..06596908 100644
--- a/android/app/src/main/assets/public/icons.js
+++ b/android/app/src/main/assets/public/icons.js
@@ -16,7 +16,6 @@ const ICONS = {
_feather: function(content, props) {
return this._create(content, { viewBox: "0 0 24 24", width: "1.4rem", height: "1.4rem", fill: "none", stroke: "var(--text-color)", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }, props);
},
-
addChat: (props) => ICONS._material(``, props),
createGroup: (props) => ICONS._material(``, props),
createSpace: (props) => ICONS._material(``, props),
@@ -28,8 +27,8 @@ const ICONS = {
delete: (props) => ICONS._material(``, props),
menu: (props) => ICONS._material(``, props),
arrowBack: (props) => ICONS._material(``, props),
- pin: (props) => ICONS._material(``, props),
- call: (props) => ICONS._material(``, props),
+ pin: (props) => ICONS._material(``, props),
+ call: (props) => ICONS._material(``, props),
account: (props) => ICONS._material(``, props),
settings: (props) => ICONS._material(``, props),
profile: (props) => ICONS._material(``, props),
diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 21860dfc..ef533d35 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -1513,6 +1513,21 @@ if (App) {
}
function popstate() {
+ if (fixedContextMenu && fixedContextMenu.classList.contains("show")) {
+ fixedContextMenu.classList.remove("show");
+ if (typeof clearContextMenuStyles === "function") clearContextMenuStyles();
+ if (typeof setActiveSidebarIndicator === "function" && typeof currentMainIndicator !== "undefined") {
+ setActiveSidebarIndicator(currentMainIndicator);
+ }
+ return;
+ }
+
+ let cropperPopup = document.getElementById("cropper-popup-container");
+ if (cropperPopup && cropperPopup.classList.contains("show")) {
+ cropperPopup.classList.remove("show");
+ return;
+ }
+
if (isProfileOpen) {
closeProfile();
return;
@@ -2561,7 +2576,8 @@ async function renderMessages(messages, isPrepend = false) {
let style = rxCounts[rxVal].me ? "background: rgba(255, 255, 255, 0.12); border-color: var(--text-color);" : "background: rgba(255, 255, 255, 0.06);";
let safeRx = encodeURIComponent(rxVal).replace(/'/g, "%27");
let escapedRxVal = escapeHtml(rxVal);
- reactionsHtml += `${processBlah(escapedRxVal)} ${rxCounts[rxVal].count > 1 ? rxCounts[rxVal].count : ""}`;
+ let pillStyle = `display: inline-flex; align-items: center; gap: 0.35rem; padding: 0.1rem 0.45rem; border-radius: 1rem; font-size: 0.85rem; border: var(--border-width) solid var(--light-border-color); cursor: pointer; ${style}`;
+ reactionsHtml += `${processBlah(escapedRxVal)}${rxCounts[rxVal].count > 1 ? `${rxCounts[rxVal].count}` : ""}`;
}
reactionsHtml += ``;
}
diff --git a/webroot/icons.js b/webroot/icons.js
index 9d419cd5..06596908 100644
--- a/webroot/icons.js
+++ b/webroot/icons.js
@@ -16,7 +16,6 @@ const ICONS = {
_feather: function(content, props) {
return this._create(content, { viewBox: "0 0 24 24", width: "1.4rem", height: "1.4rem", fill: "none", stroke: "var(--text-color)", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }, props);
},
-
addChat: (props) => ICONS._material(``, props),
createGroup: (props) => ICONS._material(``, props),
createSpace: (props) => ICONS._material(``, props),
@@ -28,8 +27,8 @@ const ICONS = {
delete: (props) => ICONS._material(``, props),
menu: (props) => ICONS._material(``, props),
arrowBack: (props) => ICONS._material(``, props),
- pin: (props) => ICONS._material(``, props),
- call: (props) => ICONS._material(``, props),
+ pin: (props) => ICONS._material(``, props),
+ call: (props) => ICONS._material(``, props),
account: (props) => ICONS._material(``, props),
settings: (props) => ICONS._material(``, props),
profile: (props) => ICONS._material(``, props),
diff --git a/webroot/main.js b/webroot/main.js
index 21860dfc..ef533d35 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -1513,6 +1513,21 @@ if (App) {
}
function popstate() {
+ if (fixedContextMenu && fixedContextMenu.classList.contains("show")) {
+ fixedContextMenu.classList.remove("show");
+ if (typeof clearContextMenuStyles === "function") clearContextMenuStyles();
+ if (typeof setActiveSidebarIndicator === "function" && typeof currentMainIndicator !== "undefined") {
+ setActiveSidebarIndicator(currentMainIndicator);
+ }
+ return;
+ }
+
+ let cropperPopup = document.getElementById("cropper-popup-container");
+ if (cropperPopup && cropperPopup.classList.contains("show")) {
+ cropperPopup.classList.remove("show");
+ return;
+ }
+
if (isProfileOpen) {
closeProfile();
return;
@@ -2561,7 +2576,8 @@ async function renderMessages(messages, isPrepend = false) {
let style = rxCounts[rxVal].me ? "background: rgba(255, 255, 255, 0.12); border-color: var(--text-color);" : "background: rgba(255, 255, 255, 0.06);";
let safeRx = encodeURIComponent(rxVal).replace(/'/g, "%27");
let escapedRxVal = escapeHtml(rxVal);
- reactionsHtml += `${processBlah(escapedRxVal)} ${rxCounts[rxVal].count > 1 ? rxCounts[rxVal].count : ""}`;
+ let pillStyle = `display: inline-flex; align-items: center; gap: 0.35rem; padding: 0.1rem 0.45rem; border-radius: 1rem; font-size: 0.85rem; border: var(--border-width) solid var(--light-border-color); cursor: pointer; ${style}`;
+ reactionsHtml += `${processBlah(escapedRxVal)}${rxCounts[rxVal].count > 1 ? `${rxCounts[rxVal].count}` : ""}`;
}
reactionsHtml += ``;
}