bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Postpone setting the brand color until soapbox.json succeeds or fails

Browse source 
Fixes color flickering during load
This commit is contained in:
Alex Gleason 2020-06-03 14:47:49 -05:00
parent 8f566b70e6
commit 3e2b282cb8
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/soapbox/containers/soapbox.js
View file

@ -48,7 +48,7 @@ const mapStateToProps = (state) => {
dyslexicFont: settings.get('dyslexicFont'), dyslexicFont: settings.get('dyslexicFont'),
demetricator: settings.get('demetricator'), demetricator: settings.get('demetricator'),
locale: settings.get('locale'), locale: settings.get('locale'),
themeCss: generateThemeCss(state.getIn(['soapbox', 'brandColor'], '#0482d8')), // Azure default themeCss: generateThemeCss(state.getIn(['soapbox', 'brandColor'])),
themeMode: settings.get('themeMode'), themeMode: settings.get('themeMode'),
}; };
}; };

13
app/soapbox/reducers/soapbox.js
View file

@ -1,12 +1,21 @@
import { SOAPBOX_CONFIG_REQUEST_SUCCESS } from '../actions/soapbox'; import {
SOAPBOX_CONFIG_REQUEST_SUCCESS,
SOAPBOX_CONFIG_REQUEST_FAIL,
} from '../actions/soapbox';
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
const initialState = ImmutableMap(); const initialState = ImmutableMap();
const defaultState = ImmutableMap({
brandColor: '#0482d8', // Azure
});
export default function soapbox(state = initialState, action) { export default function soapbox(state = initialState, action) {
switch(action.type) { switch(action.type) {
case SOAPBOX_CONFIG_REQUEST_SUCCESS: case SOAPBOX_CONFIG_REQUEST_SUCCESS:
return ImmutableMap(fromJS(action.soapboxConfig)); return defaultState.merge(ImmutableMap(fromJS(action.soapboxConfig)));
case SOAPBOX_CONFIG_REQUEST_FAIL:
return defaultState;
default: default:
return state; return state;
} }