Skip to content

Commit

Permalink
Fix list not being automatically unpinned when it returns 404 in web …
Browse files Browse the repository at this point in the history
  • Loading branch information
Gargron authored Jun 11, 2019
1 parent 4ab550f commit dc168c9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/javascript/mastodon/actions/alerts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit dc168c9

Please sign in to comment.