diff --git a/lib/static_resources.js b/lib/static_resources.js
index 11637ee2df076e6afb137f11b52ef54de9c15747..e9fa57b727e75b1fe71e98747fc262bf05d438c4 100644
--- a/lib/static_resources.js
+++ b/lib/static_resources.js
@@ -110,11 +110,13 @@ var dialog_js = und.flatten([
exports.resources = {
'/production/dialog.css': [
+ '/fonts/fonts.css',
'/css/common.css',
'/dialog/css/popup.css',
'/dialog/css/m.css'
],
'/production/browserid.css': [
+ '/fonts/fonts.css',
'/css/common.css',
'/css/style.css',
'/css/m.css'
diff --git a/resources/static/css/common.css b/resources/static/css/common.css
index c3804461ee5db73b3fbf208657f6ebe83cfcee07..c12bdae416fdfb37a4ca365559162111d5418ab9 100644
--- a/resources/static/css/common.css
+++ b/resources/static/css/common.css
@@ -291,7 +291,6 @@ a.secondary[disabled], .submit_disabled a.secondary, .submit_disabled a.secondar
}
.headline-main, h1, h2, h3, h4 {
- font-family: 'Open Sans', "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
font-weight: normal;
text-shadow: 0px 1px 0px rgba(255,255,255,0.75);
}
diff --git a/resources/static/fonts/OpenSans-Bold.eot b/resources/static/fonts/OpenSans-Bold.eot
new file mode 100644
index 0000000000000000000000000000000000000000..7c74b9c1751778ca0f0a8ef3f7289c0b8c8b9d6b
Binary files /dev/null and b/resources/static/fonts/OpenSans-Bold.eot differ
diff --git a/resources/static/fonts/OpenSans-Bold.ttf b/resources/static/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..fd79d43bea0293ac1b20e8aca1142627983d2c07
Binary files /dev/null and b/resources/static/fonts/OpenSans-Bold.ttf differ
diff --git a/resources/static/fonts/OpenSans-Bold.woff b/resources/static/fonts/OpenSans-Bold.woff
new file mode 100644
index 0000000000000000000000000000000000000000..a8b5bc261e2d20d18c8fcda6f65bb7c52cae3804
Binary files /dev/null and b/resources/static/fonts/OpenSans-Bold.woff differ
diff --git a/resources/static/fonts/OpenSans-BoldItalic.eot b/resources/static/fonts/OpenSans-BoldItalic.eot
new file mode 100644
index 0000000000000000000000000000000000000000..e1c6979628bfb8c719473abc889a489166e6b46a
Binary files /dev/null and b/resources/static/fonts/OpenSans-BoldItalic.eot differ
diff --git a/resources/static/fonts/OpenSans-BoldItalic.ttf b/resources/static/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9bc800958a421d937fc392e00beaef4eea76dc71
Binary files /dev/null and b/resources/static/fonts/OpenSans-BoldItalic.ttf differ
diff --git a/resources/static/fonts/OpenSans-BoldItalic.woff b/resources/static/fonts/OpenSans-BoldItalic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..6a1833811e187bf6174c4b06516905100f4d5c1f
Binary files /dev/null and b/resources/static/fonts/OpenSans-BoldItalic.woff differ
diff --git a/resources/static/fonts/OpenSans-Italic.eot b/resources/static/fonts/OpenSans-Italic.eot
new file mode 100644
index 0000000000000000000000000000000000000000..3fa53278733ba198c23f845ccdf62153afe9eb7b
Binary files /dev/null and b/resources/static/fonts/OpenSans-Italic.eot differ
diff --git a/resources/static/fonts/OpenSans-Italic.ttf b/resources/static/fonts/OpenSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c90da48ff3b8ad6167236d70c48df4d7b5de3bbb
Binary files /dev/null and b/resources/static/fonts/OpenSans-Italic.ttf differ
diff --git a/resources/static/fonts/OpenSans-Italic.woff b/resources/static/fonts/OpenSans-Italic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..039a294953ae18f154a91ca7407cbe9d12f37cb3
Binary files /dev/null and b/resources/static/fonts/OpenSans-Italic.woff differ
diff --git a/resources/static/fonts/OpenSans-Light.eot b/resources/static/fonts/OpenSans-Light.eot
new file mode 100644
index 0000000000000000000000000000000000000000..3c203d8e71dc546f24fa65f03bdc93d8a409a56b
Binary files /dev/null and b/resources/static/fonts/OpenSans-Light.eot differ
diff --git a/resources/static/fonts/OpenSans-Light.ttf b/resources/static/fonts/OpenSans-Light.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0d381897da20345fa63112f19042561f44ee3aa0
Binary files /dev/null and b/resources/static/fonts/OpenSans-Light.ttf differ
diff --git a/resources/static/fonts/OpenSans-Light.woff b/resources/static/fonts/OpenSans-Light.woff
new file mode 100644
index 0000000000000000000000000000000000000000..8025ba6cb5cbd7c1b444b27b4331efa4eec454f5
Binary files /dev/null and b/resources/static/fonts/OpenSans-Light.woff differ
diff --git a/resources/static/fonts/OpenSans-LightItalic.eot b/resources/static/fonts/OpenSans-LightItalic.eot
new file mode 100644
index 0000000000000000000000000000000000000000..6005799a2963b757a213a7a4b49ce6be8997654f
Binary files /dev/null and b/resources/static/fonts/OpenSans-LightItalic.eot differ
diff --git a/resources/static/fonts/OpenSans-LightItalic.ttf b/resources/static/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..68299c4bc6b5b7adfff2c9aee4aed7c1547100ef
Binary files /dev/null and b/resources/static/fonts/OpenSans-LightItalic.ttf differ
diff --git a/resources/static/fonts/OpenSans-LightItalic.woff b/resources/static/fonts/OpenSans-LightItalic.woff
new file mode 100644
index 0000000000000000000000000000000000000000..c1e29dc534e750ffaa6c641c0f9ab369765daf63
Binary files /dev/null and b/resources/static/fonts/OpenSans-LightItalic.woff differ
diff --git a/resources/static/fonts/OpenSans-Regular.eot b/resources/static/fonts/OpenSans-Regular.eot
new file mode 100644
index 0000000000000000000000000000000000000000..091cd51b9e36cc56abf245fa7f3e894873fd9e06
Binary files /dev/null and b/resources/static/fonts/OpenSans-Regular.eot differ
diff --git a/resources/static/fonts/OpenSans-Regular.ttf b/resources/static/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..db433349b7047f72f40072630c1bc110620bf09e
Binary files /dev/null and b/resources/static/fonts/OpenSans-Regular.ttf differ
diff --git a/resources/static/fonts/OpenSans-Regular.woff b/resources/static/fonts/OpenSans-Regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..58e6cb38180fc8389b73569724935e791021ab94
Binary files /dev/null and b/resources/static/fonts/OpenSans-Regular.woff differ
diff --git a/resources/static/fonts/fonts.css b/resources/static/fonts/fonts.css
new file mode 100644
index 0000000000000000000000000000000000000000..c0476e4690606ac50fd52806caba3dcc0185f444
--- /dev/null
+++ b/resources/static/fonts/fonts.css
@@ -0,0 +1,66 @@
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 400;
+ src: url('/fonts/OpenSans-Italic.eot');
+ src: local('Open Sans Italic'),
+ local('OpenSans-Italic'),
+ url('/fonts/OpenSans-Italic.eot') format('embedded-opentype'),
+ url('/fonts/OpenSans-Italic.woff') format('woff'),
+ url('/fonts/OpenSans-Italic.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 300;
+ src: url('/fonts/OpenSans-LightItalic.eot');
+ src: local('Open Sans Light Italic'),
+ local('OpenSans-LightItalic'),
+ url('/fonts/OpenSans-LightItalic.eot') format('embedded-opentype'),
+ url('/fonts/OpenSans-LightItalic.woff') format('woff'),
+ url('/fonts/OpenSans-LightItalic.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: url('/fonts/OpenSans-Regular.eot');
+ src: local('Open Sans'),
+ local('OpenSans'),
+ url('/fonts/OpenSans-Regular.eot') format('embedded-opentype'),
+ url('/fonts/OpenSans-Regular.woff') format('woff'),
+ url('/fonts/OpenSans-Regular.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 300;
+ src: url('/fonts/OpenSans-Light.eot');
+ src: local('Open Sans Light'),
+ local('OpenSans-Light'),
+ url('/fonts/OpenSans-Light.eot') format('embedded-opentype'),
+ url('/fonts/OpenSans-Light.woff') format('woff'),
+ url('/fonts/OpenSans-Light.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 700;
+ src: url('/fonts/OpenSans-Bold.eot');
+ src: local('Open Sans Bold'),
+ local('OpenSans-Bold'),
+ url('/fonts/OpenSans-Bold.eot') format('embedded-opentype'),
+ url('/fonts/OpenSans-Bold.woff') format('woff'),
+ url('/fonts/OpenSans-Bold.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 700;
+ src: url('/fonts/OpenSans-BoldItalic.eot');
+ src: local('Open Sans Bold Italic'),
+ local('OpenSans-BoldItalic'),
+ url('/fonts/OpenSans-BoldItalic.eot') format('embedded-opentype'),
+ url('/fonts/OpenSans-BoldItalic.woff') format('woff'),
+ url('/fonts/OpenSans-BoldItalic.ttf') format('truetype');
+}
diff --git a/resources/views/dialog_layout.ejs b/resources/views/dialog_layout.ejs
index c98dd034d9cd229725a47174c41551047702b8f6..6ca9a9ade30ed647c0d717a819ed21a21009c58c 100644
--- a/resources/views/dialog_layout.ejs
+++ b/resources/views/dialog_layout.ejs
@@ -16,7 +16,6 @@
<!--[if lt IE 9]>
<%- cachify_css('/production/ie8_dialog.css') %>
<![endif]-->
- <link href='https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,700,700italic' rel='stylesheet' type='text/css'>
<title><%= gettext('Mozilla Persona') %></title>
</head>
<body class="waiting">
diff --git a/resources/views/layout.ejs b/resources/views/layout.ejs
index 1373793786f965237d79b2ee474adae56e4bbe05..15f6cc731a0563929e0fcbd18997b9976e9c1ef4 100644
--- a/resources/views/layout.ejs
+++ b/resources/views/layout.ejs
@@ -10,7 +10,6 @@
<!--[if lt IE 9]>
<script src="/lib/html5shim.js"></script>
<![endif]-->
- <link href='https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,700,700italic' rel='stylesheet' type='text/css'>
<%- cachify_css('/production/browserid.css') %>
<!--[if lt IE 9]>
<%- cachify_css('/production/ie8_main.css') %>