Merge branch 'master' into as-faster-style-recalculation

This commit is contained in:
Antonio Scandurra
2015-09-09 20:53:58 +02:00
5 changed files with 146 additions and 40 deletions

View File

@@ -82,4 +82,4 @@
// Other
@font-family: 'SF UI Text', 'Lucida Grande', 'Segoe UI', Ubuntu, Cantarell, sans-serif;
@font-family: '.SFNSText-Regular', 'SF UI Text', 'Lucida Grande', 'Segoe UI', Ubuntu, Cantarell, sans-serif;