From fb7d534da2f3dac08875e8605631f7b437d04464 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Wed, 23 Oct 2013 22:04:40 +0200
Subject: [PATCH] bug 877203 pt 2 - remove obsolete/redundant font names from
 CSS in mobile/android. r=blassey

---
 mobile/android/chrome/content/aboutReader.js              | 4 ++--
 .../android/locales/en-US/chrome/aboutReader.properties   | 6 +++---
 mobile/android/themes/core/aboutFeedback.css              | 2 +-
 mobile/android/themes/core/aboutReader.css                | 8 ++++----
 mobile/android/themes/core/netError.css                   | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mobile/android/chrome/content/aboutReader.js b/mobile/android/chrome/content/aboutReader.js
index 8343d1bbe564..6b92437ab368 100644
--- a/mobile/android/chrome/content/aboutReader.js
+++ b/mobile/android/chrome/content/aboutReader.js
@@ -80,11 +80,11 @@ let AboutReader = function(doc, win) {
   let fontTypeSample = gStrings.GetStringFromName("aboutReader.fontTypeSample");
   let fontTypeOptions = [
     { name: fontTypeSample,
-      description: gStrings.GetStringFromName("aboutReader.fontTypeCharis"),
+      description: gStrings.GetStringFromName("aboutReader.fontTypeSerif"),
       value: "serif",
       linkClass: "serif" },
     { name: fontTypeSample,
-      description: gStrings.GetStringFromName("aboutReader.fontTypeOpenSans"),
+      description: gStrings.GetStringFromName("aboutReader.fontTypeSansSerif"),
       value: "sans-serif",
       linkClass: "sans-serif"
     },
diff --git a/mobile/android/locales/en-US/chrome/aboutReader.properties b/mobile/android/locales/en-US/chrome/aboutReader.properties
index 51f4d607f9b2..8e40cbfb9cbe 100644
--- a/mobile/android/locales/en-US/chrome/aboutReader.properties
+++ b/mobile/android/locales/en-US/chrome/aboutReader.properties
@@ -10,10 +10,10 @@ aboutReader.colorSchemeDark=Dark
 aboutReader.colorSchemeSepia=Sepia
 aboutReader.colorSchemeAuto=Auto
 
-# LOCALIZATION NOTE (aboutReader.fontTypeCharis, aboutReader.fontTypeOpenSans):
+# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
 # These are the names of the fonts that are used.
-aboutReader.fontTypeCharis=Charis
-aboutReader.fontTypeOpenSans=Open Sans
+aboutReader.fontTypeSerif=Charis SIL Compact
+aboutReader.fontTypeSansSerif=Clear Sans
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
diff --git a/mobile/android/themes/core/aboutFeedback.css b/mobile/android/themes/core/aboutFeedback.css
index d9933a446179..2cf1cac2cec1 100644
--- a/mobile/android/themes/core/aboutFeedback.css
+++ b/mobile/android/themes/core/aboutFeedback.css
@@ -4,7 +4,7 @@
 
 body {
   -moz-text-size-adjust: none;
-  font-family: "Open Sans",sans-serif;
+  font-family: sans-serif;
   font-size: 12px;
   color: #222;
   background-color: #ced7de;
diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 0b95b8598a13..39a8936cdfc5 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -26,11 +26,11 @@ body {
 }
 
 .sans-serif {
-  font-family: "Open Sans",sans-serif;
+  font-family: sans-serif;
 }
 
 .serif {
-  font-family: "Charis SIL",serif;
+  font-family: serif;
 }
 
 .message {
@@ -48,7 +48,7 @@ body {
 
 .domain,
 .credits {
-  font-family: "Open Sans", sans-serif;
+  font-family: sans-serif;
 }
 
 .domain {
@@ -237,7 +237,7 @@ body {
 .content .caption,
 .content .wp-caption-text,
 .content figcaption {
-  font-family: "Open Sans", sans-serif;
+  font-family: sans-serif;
   margin: 0px !important;
   padding-top: 4px !important;
 }
diff --git a/mobile/android/themes/core/netError.css b/mobile/android/themes/core/netError.css
index 5e56c77617c3..cb3ff9bb7715 100644
--- a/mobile/android/themes/core/netError.css
+++ b/mobile/android/themes/core/netError.css
@@ -23,7 +23,7 @@ body {
   font-weight: 300;
   font-size: 13px;
   -moz-text-size-adjust: none;
-  font-family: "Open Sans", sans-serif;
+  font-family: sans-serif;
 }
 
 
@@ -61,7 +61,7 @@ button {
   width: 100%;
   border: none;
   padding: 1rem;
-  font-family: "Open Sans", sans-serif;
+  font-family: sans-serif;
   background-color: #e0e2e5;
   font-size: 1rem; /* Not sure why this has to be specified. See bug 892843. */
   font-weight: 300;