Browse Source
Merge pull request #2099 from oddvar/safari-font-fix
Without this "," Safari fails to load the fontbubble
Tony Tam
8 years ago
2 changed files with 4 additions and 4 deletions
Unified View
Diff Options
+ 2
- 2
dist/css/typography.css
View File
| @@ -3,12 +3,12 @@ | |||||
| font-family: 'Droid Sans'; | font-family: 'Droid Sans'; | ||||
| font-style: normal; | font-style: normal; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype'); | |||||
| src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf'), format('truetype'); | |||||
| } | } | ||||
| /* Google Font's Droid Sans Bold */ | /* Google Font's Droid Sans Bold */ | ||||
| @font-face { | @font-face { | ||||
| font-family: 'Droid Sans'; | font-family: 'Droid Sans'; | ||||
| font-style: normal; | font-style: normal; | ||||
| font-weight: 700; | font-weight: 700; | ||||
| src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype'); | |||||
| src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf'), format('truetype'); | |||||
| } | } | ||||
+ 2
- 2
src/main/html/css/typography.css
View File
| @@ -3,12 +3,12 @@ | |||||
| font-family: 'Droid Sans'; | font-family: 'Droid Sans'; | ||||
| font-style: normal; | font-style: normal; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype'); | |||||
| src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf'), format('truetype'); | |||||
| } | } | ||||
| /* Google Font's Droid Sans Bold */ | /* Google Font's Droid Sans Bold */ | ||||
| @font-face { | @font-face { | ||||
| font-family: 'Droid Sans'; | font-family: 'Droid Sans'; | ||||
| font-style: normal; | font-style: normal; | ||||
| font-weight: 700; | font-weight: 700; | ||||
| src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype'); | |||||
| src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf'), format('truetype'); | |||||
| } | } | ||||