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

5
app/lib/user_settings_decorator.rb
View file

@ -21,6 +21,7 @@ class UserSettingsDecorator
user.settings['boost_modal'] = boost_modal_preference
user.settings['delete_modal'] = delete_modal_preference
user.settings['auto_play_gif'] = auto_play_gif_preference
user.settings['system_font_ui'] = system_font_ui_preference
end
def merged_notification_emails
@ -43,6 +44,10 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_delete_modal'
end
def system_font_ui_preference
boolean_cast_setting 'setting_system_font_ui'
end
def auto_play_gif_preference
boolean_cast_setting 'setting_auto_play_gif'
end