From 0746ef741a51bd8f92ca5e07dfb9f35b66f4cf06 Mon Sep 17 00:00:00 2001 From: f0x52 Date: Wed, 29 Mar 2023 12:18:45 +0200 Subject: [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 --- web/source/settings/admin/emoji/remote/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web/source/settings/admin/emoji/remote') 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() { <>

Custom Emoji (remote)

{error && -
{error}
+ } {isLoading ? -- cgit v1.3