From 92b572e2a3830086497900fa78dcfcc2ae919e33 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 11 Jun 2019 02:26:37 +0200 Subject: [PATCH] Fix list not being automatically unpinned when it returns 404 in web UI (#11045) --- app/javascript/mastodon/actions/alerts.js | 3 ++- app/javascript/styles/mastodon/components.scss | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js index b2c7ab76a..ef2500e7b 100644 --- a/app/javascript/mastodon/actions/alerts.js +++ b/app/javascript/mastodon/actions/alerts.js @@ -8,6 +8,7 @@ const messages = defineMessages({ export const ALERT_SHOW = 'ALERT_SHOW'; export const ALERT_DISMISS = 'ALERT_DISMISS'; export const ALERT_CLEAR = 'ALERT_CLEAR'; +export const ALERT_NOOP = 'ALERT_NOOP'; export function dismissAlert(alert) { return { @@ -36,7 +37,7 @@ export function showAlertForError(error) { if (status === 404 || status === 410) { // Skip these errors as they are reflected in the UI - return {}; + return { type: ALERT_NOOP }; } let message = statusText; diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 1093bf54f..8ea9d6905 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -3075,6 +3075,10 @@ a.status-card.compact:hover { display: flex; } +.column-header__links { + margin-bottom: 14px; +} + .column-header__links .text-btn { margin-right: 10px; }