moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'browser-theme-color' into 'develop' 

use brand color as browser theme color

See merge request soapbox-pub/soapbox-fe!675
This commit is contained in:
Alex Gleason 2021-08-15 03:45:16 +00:00
parent c7584f19f2 5abd81695a
commit e0cb4e0ec9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/soapbox/containers/soapbox.js
View File

@ -54,6 +54,7 @@ const mapStateToProps = (state) => {
demetricator: settings.get('demetricator'), demetricator: settings.get('demetricator'),
locale: validLocale(locale) ? locale : 'en', locale: validLocale(locale) ? locale : 'en',
themeCss: generateThemeCss(soapboxConfig.get('brandColor')), themeCss: generateThemeCss(soapboxConfig.get('brandColor')),
brandColor: soapboxConfig.get('brandColor'),
themeMode: settings.get('themeMode'), themeMode: settings.get('themeMode'),
halloween: settings.get('halloween'), halloween: settings.get('halloween'),
customCss: soapboxConfig.get('customCss'), customCss: soapboxConfig.get('customCss'),
@ -74,6 +75,7 @@ class SoapboxMount extends React.PureComponent {
locale: PropTypes.string.isRequired, locale: PropTypes.string.isRequired,
themeCss: PropTypes.string, themeCss: PropTypes.string,
themeMode: PropTypes.string, themeMode: PropTypes.string,
brandColor: PropTypes.string,
customCss: ImmutablePropTypes.list, customCss: ImmutablePropTypes.list,
halloween: PropTypes.bool, halloween: PropTypes.bool,
dispatch: PropTypes.func, dispatch: PropTypes.func,
@ -134,6 +136,7 @@ class SoapboxMount extends React.PureComponent {
{customCss && customCss.map(css => ( {customCss && customCss.map(css => (
<link rel='stylesheet' href={css} key={css} /> <link rel='stylesheet' href={css} key={css} />
))} ))}
<meta name='theme-color' content={this.props.brandColor} />
</Helmet> </Helmet>
<BrowserRouter> <BrowserRouter>
<ScrollContext> <ScrollContext>