luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 15:34:55 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles/fonts
History
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
..
montserrat.scss Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
roboto-mono.scss Font styles are now packagified 2017-11-18 11:05:00 -08:00
roboto.scss Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00