summaryrefslogtreecommitdiff
path: root/web/source/settings/admin/emoji/remote/index.js
diff options
context:
space:
mode:
authorLibravatar f0x52 <f0x@cthu.lu>2023-03-29 12:18:45 +0200
committerLibravatar GitHub <noreply@github.com>2023-03-29 12:18:45 +0200
commit0746ef741a51bd8f92ca5e07dfb9f35b66f4cf06 (patch)
tree3c70da50eea8bad5db78dff5ce3a7a93dfefa36b /web/source/settings/admin/emoji/remote/index.js
parent[bugfix] Remove unique constraint on public_key (#1653) (diff)
downloadgotosocial-0746ef741a51bd8f92ca5e07dfb9f35b66f4cf06.tar.xz
[frontend] Settings navigation design (#1652)
* change header image alignment (cherry picked from commit df1bb339a5c597a2b668cedb3dafec5a390df120) * big mess navigation refactor * bit of cleanup * minor css tweaks * fix error rendering code for remote emoji * refactor navigation structure code * refactor styling * fix className * stash * restructure navigation generation * url wildcard formatting * remove un-implemented User menu entry * remove commented lines * clarify permissions check * invert permissions logic for clarity
Diffstat (limited to 'web/source/settings/admin/emoji/remote/index.js')
-rw-r--r--web/source/settings/admin/emoji/remote/index.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/source/settings/admin/emoji/remote/index.js b/web/source/settings/admin/emoji/remote/index.js
index 757e443a4..bf7113b49 100644
--- a/web/source/settings/admin/emoji/remote/index.js
+++ b/web/source/settings/admin/emoji/remote/index.js
@@ -25,6 +25,7 @@ const ParseFromToot = require("./parse-from-toot");
const query = require("../../../lib/query");
const Loading = require("../../../components/loading");
+const { Error } = require("../../../components/error");
module.exports = function RemoteEmoji() {
// local emoji are queried for shortcode collision detection
@@ -42,7 +43,7 @@ module.exports = function RemoteEmoji() {
<>
<h1>Custom Emoji (remote)</h1>
{error &&
- <div className="error accent">{error}</div>
+ <Error error={error} />
}
{isLoading
? <Loading />