Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Use system's default font on non web UI pages (#4553)

Browse source 
* Use system's default font on non web UI pages

* Remove import for Redirect
This commit is contained in:
Yamagishi Kazutoshi 2017-09-01 23:13:31 +09:00 • committed by Eugen Rochko
parent ff7d02b236
commit 2305f7c391
4 changed files with 16 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,4 @@
import React from 'react';
import classNames from 'classnames';
import NotificationsContainer from './containers/notifications_container';
import PropTypes from 'prop-types';
import LoadingBarContainer from './containers/loading_bar_container';
@ -43,7 +42,6 @@ import {
import '../../components/status';
const mapStateToProps = state => ({
systemFontUi: state.getIn(['meta', 'system_font_ui']),
isComposing: state.getIn(['compose', 'is_composing']),
});
@ -58,7 +56,6 @@ export default class UI extends React.PureComponent {
static propTypes = {
dispatch: PropTypes.func.isRequired,
children: PropTypes.node,
systemFontUi: PropTypes.bool,
isComposing: PropTypes.bool,
location: PropTypes.object,
};
@ -197,12 +194,8 @@ 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={className} ref={this.setRef}>
<div className='ui' ref={this.setRef}>
<TabsBar />
<ColumnsAreaContainer ref={this.setColumnsAreaRef} singleColumn={isMobile(width)}>
<WrappedSwitch>