Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add a setting allowing the use of system's default font in Web UI (#4033)

Browse source 
* add a system_font_ui setting on the server

* Plug the system_font_ui on the front-end

* add EN/FR locales for the new setting

* put Roboto after all other fonts

* remove trailing whitespace so CodeClimate is happy

* fix user_spec.rb

* correctly write user_spect this time

* slightly better way of adding the classes

* add comments to the system-font stack for clarification

* use .system-font for the class instead

* don't use multiple lines for comments

* remove trailing whitespace

* use the classnames module for consistency

* use `mastodon-font-sans-serif` instead of Roboto directly
This commit is contained in:
Damien Erambert 2017-07-06 13:39:56 -07:00 • committed by Eugen Rochko
parent f76e71825d
commit 18d3fa953b
12 changed files with 57 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/mastodon/features/ui/index.js
View file

@ -1,4 +1,5 @@
import React from 'react';
import classNames from 'classnames';
import Switch from 'react-router-dom/Switch';
import Route from 'react-router-dom/Route';
import Redirect from 'react-router-dom/Redirect';
@ -72,12 +73,17 @@ class WrappedRoute extends React.Component {
}
@connect()
const mapStateToProps = state => ({
systemFontUi: state.getIn(['meta', 'system_font_ui']),
});
@connect(mapStateToProps)
export default class UI extends React.PureComponent {
static propTypes = {
dispatch: PropTypes.func.isRequired,
children: PropTypes.node,
systemFontUi: PropTypes.bool,
};
state = {
@ -176,8 +182,12 @@ export default class UI extends React.PureComponent {
const { width, draggingOver } = this.state;
const { children } = this.props;
const className = classNames('ui', {
'system-font': this.props.systemFontUi,
});
return (
<div className='ui' ref={this.setRef}>
<div className={className} ref={this.setRef}>
<TabsBar />
<ColumnsAreaContainer singleColumn={isMobile(width)}>
<WrappedSwitch>