Back out 8f4682511308 (bug 877203) for reftest failures

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-05-29 23:16:14 -07:00
parent f51440bfa1
commit 4bfc20478a
17 changed files with 33 additions and 34 deletions

View File

@ -14,13 +14,12 @@ packaged_fonts = \
CharisSILCompact-B.ttf \
CharisSILCompact-I.ttf \
CharisSILCompact-BI.ttf \
ClearSans-Italic.ttf \
ClearSans-BoldItalic.ttf \
ClearSans-Bold.ttf \
ClearSans-Italic.ttf \
ClearSans-MediumItalic.ttf \
ClearSans-Regular.ttf \
ClearSans-Thin.ttf \
OpenSans-Regular.ttf \
OpenSans-Bold.ttf \
OpenSans-Light.ttf \
OpenSans-Italic.ttf \
OpenSans-BoldItalic.ttf \
OpenSans-LightItalic.ttf \
$(NULL)
GARBAGE += $(packaged_fonts)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -24,7 +24,7 @@ body {
}
.sans-serif {
font-family: "Clear Sans",sans-serif;
font-family: "Open Sans",sans-serif;
}
.serif {

View File

@ -3282,83 +3282,83 @@ pref("font.name.monospace.zh-TW", "Source Code Pro");
// ar
pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars
pref("font.name.sans-serif.el", "Clear Sans");
pref("font.name.sans-serif.el", "Open Sans");
pref("font.name.monospace.el", "Droid Sans Mono");
pref("font.name-list.sans-serif.el", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.el", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.he", "Droid Serif");
pref("font.name.sans-serif.he", "Clear Sans");
pref("font.name.sans-serif.he", "Open Sans");
pref("font.name.monospace.he", "Droid Sans Mono");
pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Clear Sans, Droid Sans");
pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Open Sans, Droid Sans");
pref("font.name.serif.ja", "Charis SIL Compact");
pref("font.name.sans-serif.ja", "Clear Sans");
pref("font.name.sans-serif.ja", "Open Sans");
pref("font.name.monospace.ja", "MotoyaLMaru");
pref("font.name-list.sans-serif.ja", "Clear Sans, Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
pref("font.name-list.sans-serif.ja", "Open Sans, Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
pref("font.name.serif.ko", "Charis SIL Compact");
pref("font.name.sans-serif.ko", "Clear Sans");
pref("font.name.sans-serif.ko", "Open Sans");
pref("font.name.monospace.ko", "Droid Sans Mono");
pref("font.name-list.serif.ko", "HYSerif");
pref("font.name-list.sans-serif.ko", "SmartGothic, NanumGothic, DroidSansFallback, Droid Sans Fallback");
pref("font.name.serif.th", "Charis SIL Compact");
pref("font.name.sans-serif.th", "Clear Sans");
pref("font.name.sans-serif.th", "Open Sans");
pref("font.name.monospace.th", "Droid Sans Mono");
pref("font.name-list.sans-serif.th", "Droid Sans Thai, Clear Sans, Droid Sans");
pref("font.name-list.sans-serif.th", "Droid Sans Thai, Open Sans, Droid Sans");
pref("font.name.serif.tr", "Charis SIL Compact");
pref("font.name.sans-serif.tr", "Clear Sans");
pref("font.name.sans-serif.tr", "Open Sans");
pref("font.name.monospace.tr", "Droid Sans Mono");
pref("font.name-list.sans-serif.tr", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.tr", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.x-baltic", "Charis SIL Compact");
pref("font.name.sans-serif.x-baltic", "Clear Sans");
pref("font.name.sans-serif.x-baltic", "Open Sans");
pref("font.name.monospace.x-baltic", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-baltic", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.x-baltic", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.x-central-euro", "Charis SIL Compact");
pref("font.name.sans-serif.x-central-euro", "Clear Sans");
pref("font.name.sans-serif.x-central-euro", "Open Sans");
pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-central-euro", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.x-central-euro", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
pref("font.name.sans-serif.x-cyrillic", "Open Sans");
pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-cyrillic", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.x-cyrillic", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.x-unicode", "Charis SIL Compact");
pref("font.name.sans-serif.x-unicode", "Clear Sans");
pref("font.name.sans-serif.x-unicode", "Open Sans");
pref("font.name.monospace.x-unicode", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-unicode", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.x-unicode", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.x-user-def", "Charis SIL Compact");
pref("font.name.sans-serif.x-user-def", "Clear Sans");
pref("font.name.sans-serif.x-user-def", "Open Sans");
pref("font.name.monospace.x-user-def", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-user-def", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.x-user-def", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.x-western", "Charis SIL Compact");
pref("font.name.sans-serif.x-western", "Clear Sans");
pref("font.name.sans-serif.x-western", "Open Sans");
pref("font.name.monospace.x-western", "Droid Sans Mono");
pref("font.name-list.sans-serif.x-western", "Clear Sans, Roboto, Droid Sans");
pref("font.name-list.sans-serif.x-western", "Open Sans, Roboto, Droid Sans");
pref("font.name.serif.zh-CN", "Charis SIL Compact");
pref("font.name.sans-serif.zh-CN", "Clear Sans");
pref("font.name.sans-serif.zh-CN", "Open Sans");
pref("font.name.monospace.zh-CN", "Droid Sans Mono");
pref("font.name-list.serif.zh-CN", "Droid Sans Fallback");
pref("font.name-list.sans-serif.zh-CN", "Roboto, Droid Sans, Droid Sans Fallback");
pref("font.name-list.monospace.zh-CN", "Droid Sans Fallback");
pref("font.name.serif.zh-HK", "Charis SIL Compact");
pref("font.name.sans-serif.zh-HK", "Clear Sans");
pref("font.name.sans-serif.zh-HK", "Open Sans");
pref("font.name.monospace.zh-HK", "Droid Sans Mono");
pref("font.name-list.serif.zh-HK", "Droid Sans Fallback");
pref("font.name-list.sans-serif.zh-HK", "Roboto, Droid Sans, Droid Sans Fallback");
pref("font.name-list.monospace.zh-HK", "Droid Sans Fallback");
pref("font.name.serif.zh-TW", "Charis SIL Compact");
pref("font.name.sans-serif.zh-TW", "Clear Sans");
pref("font.name.sans-serif.zh-TW", "Open Sans");
pref("font.name.monospace.zh-TW", "Droid Sans Mono");
pref("font.name-list.serif.zh-TW", "Droid Sans Fallback");
pref("font.name-list.sans-serif.zh-TW", "Roboto, Droid Sans, Droid Sans Fallback");