Actually set default brandColor in SoapboxMount

stable/1.0.x
Alex Gleason 2020-06-03 14:20:45 -05:00
rodzic 46b1c3041f
commit e8fcd9bf18
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
2 zmienionych plików z 3 dodań i 5 usunięć

Wyświetl plik

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

Wyświetl plik

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