]> cat aescling's git repositories - mastodon.git/commit
Add a setting allowing the use of system's default font in Web UI (#4033)
authorDamien Erambert <damien.erambert@me.com>
Thu, 6 Jul 2017 20:39:56 +0000 (13:39 -0700)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 6 Jul 2017 20:39:56 +0000 (22:39 +0200)
commit18d3fa953b5af8ab17cc93c33cb95cec37127712
tree7b550c464244be47a137dfcca938a0a5de2c71a7
parentf76e71825da3b185e549cd3267813fd12cee4050
Add a setting allowing the use of system's default font in Web UI (#4033)

* 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
12 files changed:
app/controllers/settings/preferences_controller.rb
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/basics.scss
app/lib/user_settings_decorator.rb
app/models/user.rb
app/views/home/initial_state.json.rabl
app/views/settings/preferences/show.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.fr.yml
config/settings.yml
spec/lib/user_settings_decorator_spec.rb
spec/models/user_spec.rb