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

8
spec/models/user_spec.rb
View file

@ -184,6 +184,14 @@ RSpec.describe User, type: :model do
expect(user.setting_auto_play_gif).to eq false
end
end
describe '#setting_system_font_ui' do
it 'returns system font ui setting' do
user = Fabricate(:user)
user.settings[:system_font_ui] = false
expect(user.setting_system_font_ui).to eq false
end
end
describe '#setting_boost_modal' do
it 'returns boost modal setting' do