Bug 1426390 - Serve WOFF2 Fira Sans font

23 files changed, 16 insertions, 8 deletions

diff --git a/skins/standard/fira/FiraSans-Bold.woff b/skins/standard/fira/FiraSans-Bold.woff
deleted file mode 100644
index a8dba6487..000000000
--- a/skins/standard/fira/FiraSans-Bold.woff
+++ /dev/null
diff --git a/skins/standard/fira/FiraSans-BoldItalic.woff b/skins/standard/fira/FiraSans-BoldItalic.woff
deleted file mode 100644
index 54895de69..000000000
--- a/skins/standard/fira/FiraSans-BoldItalic.woff
+++ /dev/null
diff --git a/skins/standard/fira/FiraSans-Italic.woff b/skins/standard/fira/FiraSans-Italic.woff
deleted file mode 100644
index 298019498..000000000
--- a/skins/standard/fira/FiraSans-Italic.woff
+++ /dev/null
diff --git a/skins/standard/fira/FiraSans-Regular.woff b/skins/standard/fira/FiraSans-Regular.woff
deleted file mode 100644
index d8e0363f4..000000000
--- a/skins/standard/fira/FiraSans-Regular.woff
+++ /dev/null
diff --git a/skins/standard/fira/FiraSans-SemiBold.woff b/skins/standard/fira/FiraSans-SemiBold.woff
deleted file mode 100644
index 8b408d4d0..000000000
--- a/skins/standard/fira/FiraSans-SemiBold.woff
+++ /dev/null
diff --git a/skins/standard/fira/FiraSans-SemiBoldItalic.woff b/skins/standard/fira/FiraSans-SemiBoldItalic.woff
deleted file mode 100644
index 2592e4fcf..000000000
--- a/skins/standard/fira/FiraSans-SemiBoldItalic.woff
+++ /dev/null
diff --git a/skins/standard/fira/FiraMono-Bold.woff b/skins/standard/fonts/FiraMono-Bold.woff
index 735352fb9..735352fb9 100644
--- a/skins/standard/fira/FiraMono-Bold.woff
+++ b/skins/standard/fonts/FiraMono-Bold.woff
diff --git a/skins/standard/fonts/FiraMono-Bold.woff2 b/skins/standard/fonts/FiraMono-Bold.woff2
new file mode 100644
index 000000000..832aaabbb
--- /dev/null
+++ b/skins/standard/fonts/FiraMono-Bold.woff2
diff --git a/skins/standard/fira/FiraMono-Regular.woff b/skins/standard/fonts/FiraMono-Regular.woff
index b38ee144d..b38ee144d 100644
--- a/skins/standard/fira/FiraMono-Regular.woff
+++ b/skins/standard/fonts/FiraMono-Regular.woff
diff --git a/skins/standard/fonts/FiraMono-Regular.woff2 b/skins/standard/fonts/FiraMono-Regular.woff2
new file mode 100644
index 000000000..9fa44b7cc
--- /dev/null
+++ b/skins/standard/fonts/FiraMono-Regular.woff2
diff --git a/skins/standard/fonts/FiraSans-Bold.woff b/skins/standard/fonts/FiraSans-Bold.woff
new file mode 100644
index 000000000..21b0b7ce1
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-Bold.woff
diff --git a/skins/standard/fonts/FiraSans-Bold.woff2 b/skins/standard/fonts/FiraSans-Bold.woff2
new file mode 100644
index 000000000..b544c1250
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-Bold.woff2
diff --git a/skins/standard/fonts/FiraSans-BoldItalic.woff b/skins/standard/fonts/FiraSans-BoldItalic.woff
new file mode 100644
index 000000000..a48dbf8f8
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-BoldItalic.woff
diff --git a/skins/standard/fonts/FiraSans-BoldItalic.woff2 b/skins/standard/fonts/FiraSans-BoldItalic.woff2
new file mode 100644
index 000000000..751a3c0c7
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-BoldItalic.woff2
diff --git a/skins/standard/fonts/FiraSans-Italic.woff b/skins/standard/fonts/FiraSans-Italic.woff
new file mode 100644
index 000000000..1ee12bfb0
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-Italic.woff
diff --git a/skins/standard/fonts/FiraSans-Italic.woff2 b/skins/standard/fonts/FiraSans-Italic.woff2
new file mode 100644
index 000000000..2bd1af5b6
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-Italic.woff2
diff --git a/skins/standard/fonts/FiraSans-Regular.woff b/skins/standard/fonts/FiraSans-Regular.woff
new file mode 100644
index 000000000..1ea1030bc
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-Regular.woff
diff --git a/skins/standard/fonts/FiraSans-Regular.woff2 b/skins/standard/fonts/FiraSans-Regular.woff2
new file mode 100644
index 000000000..7c87e0633
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-Regular.woff2
diff --git a/skins/standard/fonts/FiraSans-SemiBold.woff b/skins/standard/fonts/FiraSans-SemiBold.woff
new file mode 100644
index 000000000..ce680eb06
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-SemiBold.woff
diff --git a/skins/standard/fonts/FiraSans-SemiBold.woff2 b/skins/standard/fonts/FiraSans-SemiBold.woff2
new file mode 100644
index 000000000..bd9cadb43
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-SemiBold.woff2
diff --git a/skins/standard/fonts/FiraSans-SemiBoldItalic.woff b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff
new file mode 100644
index 000000000..d45f8a446
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff
diff --git a/skins/standard/fonts/FiraSans-SemiBoldItalic.woff2 b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff2
new file mode 100644
index 000000000..e38b7ed5a
--- /dev/null
+++ b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff2
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 9b9ae6550..a00839de9 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -993,7 +993,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Sans';
     src: local('Fira Sans'), local('FiraSans'),
-         url('fira/FiraSans-Regular.woff') format('woff');
+         url('fonts/FiraSans-Regular.woff2?v=4.203') format('woff2'),
+         url('fonts/FiraSans-Regular.woff?v=4.203') format('woff');
     font-weight: 400;
     font-style: normal;
 }
@@ -1001,7 +1002,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Sans';
     src: local('Fira Sans Italic'), local('FiraSansItalic'),
-         url('fira/FiraSans-Italic.woff') format('woff');
+         url('fonts/FiraSans-Italic.woff2?v=4.203') format('woff2'),
+         url('fonts/FiraSans-Italic.woff?v=4.203') format('woff');
     font-weight: 400;
     font-style: italic;
 }
@@ -1009,7 +1011,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Sans';
     src: local('Fira Sans SemiBold'), local('FiraSansSemiBold'),
-         url('fira/FiraSans-SemiBold.woff') format('woff');
+         url('fonts/FiraSans-SemiBold.woff2?v=4.203') format('woff2'),
+         url('fonts/FiraSans-SemiBold.woff?v=4.203') format('woff');
     font-weight: 600;
     font-style: normal;
 }
@@ -1017,7 +1020,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Sans';
     src: local('Fira Sans SemiBold Italic'), local('FiraSansSemiBoldItalic'),
-         url('fira/FiraSans-SemiBoldItalic.woff') format('woff');
+         url('fonts/FiraSans-SemiBoldItalic.woff2?v=4.203') format('woff2'),
+         url('fonts/FiraSans-SemiBoldItalic.woff?v=4.203') format('woff');
     font-weight: 600;
     font-style: italic;
 }
@@ -1025,7 +1029,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Sans';
     src: local('Fira Sans Bold'), local('FiraSansBold'),
-         url('fira/FiraSans-Bold.woff') format('woff');
+         url('fonts/FiraSans-Bold.woff2?v=4.203') format('woff2'),
+         url('fonts/FiraSans-Bold.woff?v=4.203') format('woff');
     font-weight: 700;
     font-style: normal;
 }
@@ -1033,7 +1038,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Sans';
     src: local('Fira Sans Bold Italic'), local('FiraSansBoldItalic'),
-         url('fira/FiraSans-BoldItalic.woff') format('woff');
+         url('fonts/FiraSans-BoldItalic.woff2?v=4.203') format('woff2'),
+         url('fonts/FiraSans-BoldItalic.woff?v=4.203') format('woff');
     font-weight: 700;
     font-style: italic;
 }
@@ -1041,7 +1047,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Mono';
     src: local('Fira Mono'), local('FiraMono'),
-         url('fira/FiraMono-Regular.woff') format('woff');
+         url('fonts/FiraMono-Regular.woff2?v=3.202') format('woff2'),
+         url('fonts/FiraMono-Regular.woff?v=3.202') format('woff');
     font-weight: 400;
     font-style: normal;
 }
@@ -1049,7 +1056,8 @@ input.required, select.required, span.required_explanation {
 @font-face{
     font-family: 'Fira Mono';
     src: local('Fira Mono Bold'), local('FiraMonoBold'),
-         url('fira/FiraMono-Bold.woff') format('woff');
+         url('fonts/FiraMono-Bold.woff2?v=3.202') format('woff2'),
+         url('fonts/FiraMono-Bold.woff?v=3.202') format('woff');
     font-weight: 600;
     font-style: normal;
 }