diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-05 13:37:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 13:37:48 +0100 |
| commit | 87f76d4095ff5008236a7bfa6a33c136cbd50b29 (patch) | |
| tree | 80e6337267c613eb8657b1290f07bfee9bbc35a1 /app/assets/javascripts | |
| parent | c3c9879b5e319a0192a172b34c7c2fd4f3d35da5 (diff) | |
| parent | 1f3c895ffb320c188b77b0036603b40a22733902 (diff) | |
Merge pull request #403 from ticky/use-system-fonts
Use system fonts on more platforms
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/components/components/button.jsx | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/components/features/compose/components/search.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/components/button.jsx b/app/assets/javascripts/components/components/button.jsx index d63129013..19c52550a 100644 --- a/app/assets/javascripts/components/components/button.jsx +++ b/app/assets/javascripts/components/components/button.jsx @@ -27,7 +27,7 @@ const Button = React.createClass({ render () { const style = { - fontFamily: 'Roboto', + fontFamily: 'inherit', display: this.props.block ? 'block' : 'inline-block', width: this.props.block ? '100%' : 'auto', position: 'relative', diff --git a/app/assets/javascripts/components/features/compose/components/search.jsx b/app/assets/javascripts/components/features/compose/components/search.jsx index b4e618820..e4672216b 100644 --- a/app/assets/javascripts/components/features/compose/components/search.jsx +++ b/app/assets/javascripts/components/features/compose/components/search.jsx @@ -38,7 +38,7 @@ const inputStyle = { border: 'none', padding: '10px', paddingRight: '30px', - fontFamily: 'Roboto', + fontFamily: 'inherit', background: '#282c37', color: '#9baec8', fontSize: '14px', |