bug 877203 pt 2 - remove obsolete/redundant font names from CSS in mobile/android. r=blassey
authorJonathan Kew <jkew@mozilla.com>
Wed, 23 Oct 2013 22:04:40 +0200
changeset 166658 7e8f868d1abe4c3dc12bf23b7e6ae0d1a171ecbf
parent 166657 16ea1b03d8fe67d15f8b5d2baaa7697c0bb414ed
child 166659 440b13668e560b8467fb350a8896170b01e8665e
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey
bugs877203
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 877203 pt 2 - remove obsolete/redundant font names from CSS in mobile/android. r=blassey
mobile/android/chrome/content/aboutReader.js
mobile/android/locales/en-US/chrome/aboutReader.properties
mobile/android/themes/core/aboutFeedback.css
mobile/android/themes/core/aboutReader.css
mobile/android/themes/core/netError.css
--- a/mobile/android/chrome/content/aboutReader.js
+++ b/mobile/android/chrome/content/aboutReader.js
@@ -75,21 +75,21 @@ let AboutReader = function(doc, win) {
 
   let colorScheme = Services.prefs.getCharPref("reader.color_scheme");
   this._setupSegmentedButton("color-scheme-buttons", colorSchemeOptions, colorScheme, this._setColorSchemePref.bind(this));
   this._setColorSchemePref(colorScheme);
 
   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"
     },
   ];
 
   let fontType = Services.prefs.getCharPref("reader.font_type");
   this._setupSegmentedButton("font-type-buttons", fontTypeOptions, fontType, this._setFontType.bind(this));
   this._setFontType(fontType);
--- a/mobile/android/locales/en-US/chrome/aboutReader.properties
+++ b/mobile/android/locales/en-US/chrome/aboutReader.properties
@@ -5,20 +5,20 @@
 aboutReader.loading=Loading...
 aboutReader.loadError=Failed to load article from page
 
 aboutReader.colorSchemeLight=Light
 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
 
 # LOCALIZATION NOTE (aboutReader.fontSizeSample): String used to sample a relative font size
 # for the font size setting. Tapping different samples will change the font size.
 aboutReader.fontSizeSample=A
 
--- a/mobile/android/themes/core/aboutFeedback.css
+++ b/mobile/android/themes/core/aboutFeedback.css
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 body {
   -moz-text-size-adjust: none;
-  font-family: "Open Sans",sans-serif;
+  font-family: sans-serif;
   font-size: 12px;
   color: #222;
   background-color: #ced7de;
   padding: 10px;
 }
 
 a {
   color: #004b98;
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -21,21 +21,21 @@ body {
 }
 
 .dark {
   background-color: #000000;
   color: #eeeeee;
 }
 
 .sans-serif {
-  font-family: "Open Sans",sans-serif;
+  font-family: sans-serif;
 }
 
 .serif {
-  font-family: "Charis SIL",serif;
+  font-family: serif;
 }
 
 .message {
   margin-top: 40px;
   display: none;
   text-align: center;
   width: 100%;
   font-size: 16px;
@@ -43,17 +43,17 @@ body {
 
 .header {
   text-align: start;
   display: none;
 }
 
 .domain,
 .credits {
-  font-family: "Open Sans", sans-serif;
+  font-family: sans-serif;
 }
 
 .domain {
   margin-top: 10px;
   padding-bottom: 10px;
   color: #00acff !important;
   text-decoration: none;
 }
@@ -232,17 +232,17 @@ body {
 .content figure img {
   margin-bottom: 0px !important;
 }
 
 /* Image caption text */
 .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;
 }
 
 .light > .content .caption,
 .light > .content .wp-caption-text,
 .light > .content figcaption {
   color: #898989;
--- a/mobile/android/themes/core/netError.css
+++ b/mobile/android/themes/core/netError.css
@@ -18,17 +18,17 @@ body {
 
   background-color: #f1f1f1;
   min-height: 100%;
   padding: 0 20px;
 
   font-weight: 300;
   font-size: 13px;
   -moz-text-size-adjust: none;
-  font-family: "Open Sans", sans-serif;
+  font-family: sans-serif;
 }
 
 
 ul {
   /* Shove the list indicator so that its left aligned, but use outside so that text
    * doesn't don't wrap the text around it */
   padding: 1em;
   margin: 0;
@@ -56,17 +56,17 @@ h2 {
 p {
   margin-top: 0;
 }
 
 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;
   border-radius: 2px;
   background-image: none;
 }
 
 button + button {