queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Glitch] Fix list not being automatically unpinned when it returns 404 in web UI

Browse source 
Port 92b572e2a3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
Eugen Rochko 2019-06-11 02:26:37 +02:00 committed by Thibaut Girka
parent 7065ba5930
commit 82899b3d2e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/flavours/glitch/actions/alerts.js
View file

@ -8,6 +8,7 @@ const messages = defineMessages({
export const ALERT_SHOW = 'ALERT_SHOW'; export const ALERT_SHOW = 'ALERT_SHOW';
export const ALERT_DISMISS = 'ALERT_DISMISS'; export const ALERT_DISMISS = 'ALERT_DISMISS';
export const ALERT_CLEAR = 'ALERT_CLEAR'; export const ALERT_CLEAR = 'ALERT_CLEAR';
export const ALERT_NOOP = 'ALERT_NOOP';
export function dismissAlert(alert) { export function dismissAlert(alert) {
return { return {
@ -36,7 +37,7 @@ export function showAlertForError(error) {
if (status === 404 || status === 410) { if (status === 404 || status === 410) {
// Skip these errors as they are reflected in the UI // Skip these errors as they are reflected in the UI
return {}; return { type: ALERT_NOOP };
} }
let message = statusText; let message = statusText;

4
app/javascript/flavours/glitch/styles/components/columns.scss
View file

@ -294,6 +294,10 @@
margin-left: 0; margin-left: 0;
} }
.column-header__links {
margin-bottom: 14px;
}
.column-header__links .text-btn { .column-header__links .text-btn {
margin-right: 10px; margin-right: 10px;
} }