about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-06-11 02:26:37 +0200
committerGitHub <noreply@github.com>2019-06-11 02:26:37 +0200
commit92b572e2a3830086497900fa78dcfcc2ae919e33 (patch)
treeb88f2015cf45902bb0aca5533e4cb936e2f8d7a8 /app
parentef438bd7e8e07f13bebd0ee66bfa099a9c6cb9b5 (diff)
Fix list not being automatically unpinned when it returns 404 in web UI (#11045)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/actions/alerts.js3
-rw-r--r--app/javascript/styles/mastodon/components.scss4
2 files changed, 6 insertions, 1 deletions
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;
 }