wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1135234 - Use "serif" and "sans-serif" in reader mode controls to match desktop. r=bnicholson

Browse Source
This commit is contained in:
Margaret Leibovic 2015-02-20 13:27:09 -08:00
parent 644367a3e6
commit 0037490472
5 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/app/mobile.js
View File

@ -860,11 +860,5 @@ pref("reader.color_scheme", "auto");
// Color scheme values available in reader mode UI.
pref("reader.color_scheme.values", "[\"light\",\"dark\",\"auto\"]");
// The font type in reader (charis-sil, clear-sans)
pref("reader.font_type", "clear-sans");
// Font type values available in reader mode UI.
pref("reader.font_type.values", "[\"charis-sil\",\"clear-sans\"]");
// Whether to use a vertical or horizontal toolbar.
pref("reader.toolbar.vertical", false);

4
mobile/android/themes/core/aboutReader.css
View File

@ -25,11 +25,11 @@ body {
color: #eeeeee;
}
.clear-sans {
.sans-serif {
font-family: sans-serif;
}
.charis-sil {
.serif {
font-family: serif;
}

3
modules/libpref/init/all.js
View File

@ -4555,9 +4555,6 @@ pref("reader.color_scheme.values", "[\"light\",\"dark\",\"sepia\"]");
// The font type in reader (sans-serif, serif)
pref("reader.font_type", "sans-serif");
// Font type values available in reader mode UI.
pref("reader.font_type.values", "[\"serif\",\"sans-serif\"]");
// Whether or not the user has interacted with the reader mode toolbar.
// This is used to show a first-launch tip in reader mode.
pref("reader.has_used_toolbar", false);

18
toolkit/components/reader/AboutReader.jsm
View File

@ -73,13 +73,17 @@ let AboutReader = function(mm, win) {
this._setColorSchemePref(colorScheme);
let fontTypeSample = gStrings.GetStringFromName("aboutReader.fontTypeSample");
let fontTypeValues = JSON.parse(Services.prefs.getCharPref("reader.font_type.values"));
let fontTypeOptions = fontTypeValues.map((value) => {
return { name: fontTypeSample,
description: gStrings.GetStringFromName("aboutReader.fontType." + value),
value: value,
linkClass: value };
});
let fontTypeOptions = [
{ name: fontTypeSample,
description: gStrings.GetStringFromName("aboutReader.fontType.serif"),
value: "serif",
linkClass: "serif" },
{ name: fontTypeSample,
description: gStrings.GetStringFromName("aboutReader.fontType.sans-serif"),
value: "sans-serif",
linkClass: "sans-serif"
},
];
let fontType = Services.prefs.getCharPref("reader.font_type");
this._setupSegmentedButton("font-type-buttons", fontTypeOptions, fontType, this._setFontType.bind(this));

7
toolkit/locales/en-US/chrome/global/aboutReader.properties
View File

@ -11,15 +11,10 @@ aboutReader.colorScheme.sepia=Sepia
aboutReader.colorScheme.auto=Auto
# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
# These are the styles of typeface that are used on desktop.
# These are the styles of typeface that are options in the reader view controls.
aboutReader.fontType.serif=Serif
aboutReader.fontType.sans-serif=Sans-serif
# LOCALIZATION NOTE (aboutReader.fontType.charis-sil, aboutReader.fontType.clear-sans):
# These are the names of the fonts that are used on Android
aboutReader.fontType.charis-sil=Charis SIL Compact
aboutReader.fontType.clear-sans=Clear Sans
# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
aboutReader.fontTypeSample=Aa