Merge pull request #2711 from ClearlyClaire/glitch-soc/merge-upstream
Port upstream changes up to b2388be71e
This commit is contained in:
commit
9668ac5acd
2 changed files with 5 additions and 5 deletions
|
@ -20,7 +20,7 @@ export function changeSetting(path, value) {
|
|||
}
|
||||
|
||||
const debouncedSave = debounce((dispatch, getState) => {
|
||||
if (getState().getIn(['settings', 'saved'])) {
|
||||
if (getState().getIn(['settings', 'saved']) || !getState().getIn(['meta', 'me'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -4602,10 +4602,6 @@ a.status-card {
|
|||
outline: $ui-button-focus-outline;
|
||||
}
|
||||
|
||||
.no-reduce-motion .icon {
|
||||
transition: transform 0.15s ease-in-out;
|
||||
}
|
||||
|
||||
&.active {
|
||||
color: $primary-text-color;
|
||||
|
||||
|
@ -4663,6 +4659,10 @@ a.status-card {
|
|||
padding: 0;
|
||||
}
|
||||
|
||||
.no-reduce-motion .column-header__button .icon {
|
||||
transition: transform 150ms ease-in-out;
|
||||
}
|
||||
|
||||
.column-header__collapsible {
|
||||
max-height: 70vh;
|
||||
overflow: hidden;
|
||||
|
|
Loading…
Reference in a new issue