diff options
author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-09-01 23:13:31 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-01 16:13:31 +0200 |
commit | 2305f7c391325c7abf8746ebb2bb560c13df4437 (patch) | |
tree | 53e0d6023d6c68278d363dfe8301f5cbca9896f8 /app/javascript/mastodon | |
parent | ff7d02b2360bea107519f923cf084cbdd7fbca07 (diff) |
Use system's default font on non web UI pages (#4553)
* Use system's default font on non web UI pages * Remove import for Redirect
Diffstat (limited to 'app/javascript/mastodon')
-rw-r--r-- | app/javascript/mastodon/features/ui/index.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index 34b59fcc5..8f971ae67 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -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> |