From 340a146295394b83690bc5a865bca10d13da04d9 Mon Sep 17 00:00:00 2001 From: James Long Date: Wed, 18 Apr 2012 11:16:37 -0400 Subject: [PATCH] add lang attribute to 3.6 billboard pages, add tweaks to japanese style --- apps/firefox/templates/firefox/unsupported-EOL.html | 2 +- .../templates/firefox/unsupported-details.html | 2 +- .../templates/firefox/unsupported-warning.html | 2 +- .../firefox/templates/firefox/unsupported-win2k.html | 2 +- .../firefox/templates/firefox/unsupported-winxp.html | 2 +- media/css/unsupported.css | 12 ++++++++++++ templates/base.html | 6 +++--- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/firefox/templates/firefox/unsupported-EOL.html b/apps/firefox/templates/firefox/unsupported-EOL.html index abdb85812c..5807bf173d 100644 --- a/apps/firefox/templates/firefox/unsupported-EOL.html +++ b/apps/firefox/templates/firefox/unsupported-EOL.html @@ -1,6 +1,6 @@ {% set_lang_files "upgradedialog" %} - + {{ _('Get the Newest Firefox') }} diff --git a/apps/firefox/templates/firefox/unsupported-details.html b/apps/firefox/templates/firefox/unsupported-details.html index abdb85812c..5807bf173d 100644 --- a/apps/firefox/templates/firefox/unsupported-details.html +++ b/apps/firefox/templates/firefox/unsupported-details.html @@ -1,6 +1,6 @@ {% set_lang_files "upgradedialog" %} - + {{ _('Get the Newest Firefox') }} diff --git a/apps/firefox/templates/firefox/unsupported-warning.html b/apps/firefox/templates/firefox/unsupported-warning.html index db9ce56e6e..7e4342ec9c 100644 --- a/apps/firefox/templates/firefox/unsupported-warning.html +++ b/apps/firefox/templates/firefox/unsupported-warning.html @@ -1,6 +1,6 @@ {% set_lang_files "upgradedialog" %} - + {{ _('Get the Newest Firefox') }} diff --git a/apps/firefox/templates/firefox/unsupported-win2k.html b/apps/firefox/templates/firefox/unsupported-win2k.html index b18d3fbf8c..848d7efa9e 100644 --- a/apps/firefox/templates/firefox/unsupported-win2k.html +++ b/apps/firefox/templates/firefox/unsupported-win2k.html @@ -1,6 +1,6 @@ {% set_lang_files "upgradedialog" %} - + {{ _('Get the Newest Firefox') }} diff --git a/apps/firefox/templates/firefox/unsupported-winxp.html b/apps/firefox/templates/firefox/unsupported-winxp.html index 3ce1ac7fbd..0ea983b6b9 100644 --- a/apps/firefox/templates/firefox/unsupported-winxp.html +++ b/apps/firefox/templates/firefox/unsupported-winxp.html @@ -1,6 +1,6 @@ {% set_lang_files "upgradedialog" %} - + {{ _('Get the Newest Firefox') }} diff --git a/media/css/unsupported.css b/media/css/unsupported.css index b126bfcf8d..ebd3e58b79 100644 --- a/media/css/unsupported.css +++ b/media/css/unsupported.css @@ -103,3 +103,15 @@ body { } /* }}} */ + + +/* Tweaks for Japanese */ +html[lang='ja'] body { + font-size: 12px; + line-height: 1.5; + font-family: "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", メイリオ, Meiryo, Verdana, "ＭＳ Ｐゴシック", "MS PGothic", "VL Pゴシック", "Takao Pゴシック", "IPA Pゴシック", sans-serif; +} + +html[lang='ja'] h1 { + font-family: inherit; +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 97a8d29363..c2e685f24e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,8 +1,8 @@ {% set_lang_files "" %} - - - + + +