monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2711 from ClearlyClaire/glitch-soc/merge-upstream 

Port upstream changes up to b2388be71e
This commit is contained in:
Claire 2024-05-17 12:32:59 +02:00 committed by GitHub
parent 87b5cfc60e 7b078b46a2
commit 9668ac5acd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/actions/settings.js
View File

@ -20,7 +20,7 @@ export function changeSetting(path, value) {
} }
const debouncedSave = debounce((dispatch, getState) => { const debouncedSave = debounce((dispatch, getState) => {
if (getState().getIn(['settings', 'saved'])) { if (getState().getIn(['settings', 'saved']) || !getState().getIn(['meta', 'me'])) {
return; return;
} }

8
app/javascript/flavours/glitch/styles/components.scss
View File

@ -4602,10 +4602,6 @@ a.status-card {
outline: $ui-button-focus-outline; outline: $ui-button-focus-outline;
} }
.no-reduce-motion .icon {
transition: transform 0.15s ease-in-out;
}
&.active { &.active {
color: $primary-text-color; color: $primary-text-color;
@ -4663,6 +4659,10 @@ a.status-card {
padding: 0; padding: 0;
} }
.no-reduce-motion .column-header__button .icon {
transition: transform 150ms ease-in-out;
}
.column-header__collapsible { .column-header__collapsible {
max-height: 70vh; max-height: 70vh;
overflow: hidden; overflow: hidden;