From c143808fb84b840842dfa0fd5c13fd011d2e1b8c Mon Sep 17 00:00:00 2001 From: Tilo Mitra Date: Thu, 29 Aug 2013 15:44:39 -0400 Subject: [PATCH] Revert "Remove "Droid Sans" from the font stack." This reverts commit 1a24fa0baa01e48e6a706c1f2e31447020594165. Looks like Android < 4 only has 3 fonts installed - * Droid Sans * Droid Serif * Droid Sans Mono So we do need to keep Droid Sans in. http://www.granneman.com/webdev/coding/css/fonts-and-formatting/default-fonts/#android --- HISTORY.md | 2 +- src/grids/css/grids-core.css | 4 +++- src/grids/css/grids-r.css | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 82ed2bd..132e47a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -52,7 +52,7 @@ NEXT grids from breaking in various target environments: ```css - font-family: FreeSans, Arimo, Helvetica, Arial, sans-serif; + font-family: FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; ``` This is a *breaking* change. If you are using any non-default font in your project, diff --git a/src/grids/css/grids-core.css b/src/grids/css/grids-core.css index bdb609e..9a733b8 100644 --- a/src/grids/css/grids-core.css +++ b/src/grids/css/grids-core.css @@ -19,10 +19,12 @@ Arial` to get picked up by the browser, even though Helvetica or Arial isn't available in that environment. + * Droid Sans: Arch Linux with Chromium 29.x. + * Helvetica, Arial, sans-serif: Common font stack on OSX and Windows. */ - font-family: FreeSans, Arimo, Helvetica, Arial, sans-serif; + font-family: FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; } /* Opera as of 12 on Windows needs word-spacing. diff --git a/src/grids/css/grids-r.css b/src/grids/css/grids-r.css index 3a95da5..8a5f2d6 100644 --- a/src/grids/css/grids-r.css +++ b/src/grids/css/grids-r.css @@ -18,10 +18,12 @@ Arial` to get picked up by the browser, even though Helvetica or Arial isn't available in that environment. + * Droid Sans: Arch Linux with Chromium 29.x. + * Helvetica, Arial, sans-serif: Common font stack on OSX and Windows. */ - font-family: FreeSans, Arimo, Helvetica, Arial, sans-serif; + font-family: FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; } /* Opera as of 12 on Windows needs word-spacing.