Bug 1426390 - Serve WOFF2 Fira Sans font

diff --git a/skins/standard/fira/FiraSans-Bold.woff b/skins/standard/fira/FiraSans-Bold.woff
deleted file mode 100644 (file)
index a8dba64..0000000
Binary files a/skins/standard/fira/FiraSans-Bold.woff and /dev/null differ

diff --git a/skins/standard/fira/FiraSans-BoldItalic.woff b/skins/standard/fira/FiraSans-BoldItalic.woff
deleted file mode 100644 (file)
index 54895de..0000000
Binary files a/skins/standard/fira/FiraSans-BoldItalic.woff and /dev/null differ

diff --git a/skins/standard/fira/FiraSans-Italic.woff b/skins/standard/fira/FiraSans-Italic.woff
deleted file mode 100644 (file)
index 2980194..0000000
Binary files a/skins/standard/fira/FiraSans-Italic.woff and /dev/null differ

diff --git a/skins/standard/fira/FiraSans-Regular.woff b/skins/standard/fira/FiraSans-Regular.woff
deleted file mode 100644 (file)
index d8e0363..0000000
Binary files a/skins/standard/fira/FiraSans-Regular.woff and /dev/null differ

diff --git a/skins/standard/fira/FiraSans-SemiBold.woff b/skins/standard/fira/FiraSans-SemiBold.woff
deleted file mode 100644 (file)
index 8b408d4..0000000
Binary files a/skins/standard/fira/FiraSans-SemiBold.woff and /dev/null differ

diff --git a/skins/standard/fira/FiraSans-SemiBoldItalic.woff b/skins/standard/fira/FiraSans-SemiBoldItalic.woff
deleted file mode 100644 (file)
index 2592e4f..0000000
Binary files a/skins/standard/fira/FiraSans-SemiBoldItalic.woff and /dev/null differ

diff --git a/skins/standard/fira/FiraMono-Bold.woff b/skins/standard/fonts/FiraMono-Bold.woff
similarity index 100%
rename from skins/standard/fira/FiraMono-Bold.woff
rename to 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 (file)
index 0000000..832aaab
Binary files /dev/null and b/skins/standard/fonts/FiraMono-Bold.woff2 differ

diff --git a/skins/standard/fira/FiraMono-Regular.woff b/skins/standard/fonts/FiraMono-Regular.woff
similarity index 100%
rename from skins/standard/fira/FiraMono-Regular.woff
rename to 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 (file)
index 0000000..9fa44b7
Binary files /dev/null and b/skins/standard/fonts/FiraMono-Regular.woff2 differ

diff --git a/skins/standard/fonts/FiraSans-Bold.woff b/skins/standard/fonts/FiraSans-Bold.woff
new file mode 100644 (file)
index 0000000..21b0b7c
Binary files /dev/null and b/skins/standard/fonts/FiraSans-Bold.woff differ

diff --git a/skins/standard/fonts/FiraSans-Bold.woff2 b/skins/standard/fonts/FiraSans-Bold.woff2
new file mode 100644 (file)
index 0000000..b544c12
Binary files /dev/null and b/skins/standard/fonts/FiraSans-Bold.woff2 differ

diff --git a/skins/standard/fonts/FiraSans-BoldItalic.woff b/skins/standard/fonts/FiraSans-BoldItalic.woff
new file mode 100644 (file)
index 0000000..a48dbf8
Binary files /dev/null and b/skins/standard/fonts/FiraSans-BoldItalic.woff differ

diff --git a/skins/standard/fonts/FiraSans-BoldItalic.woff2 b/skins/standard/fonts/FiraSans-BoldItalic.woff2
new file mode 100644 (file)
index 0000000..751a3c0
Binary files /dev/null and b/skins/standard/fonts/FiraSans-BoldItalic.woff2 differ

diff --git a/skins/standard/fonts/FiraSans-Italic.woff b/skins/standard/fonts/FiraSans-Italic.woff
new file mode 100644 (file)
index 0000000..1ee12bf
Binary files /dev/null and b/skins/standard/fonts/FiraSans-Italic.woff differ

diff --git a/skins/standard/fonts/FiraSans-Italic.woff2 b/skins/standard/fonts/FiraSans-Italic.woff2
new file mode 100644 (file)
index 0000000..2bd1af5
Binary files /dev/null and b/skins/standard/fonts/FiraSans-Italic.woff2 differ

diff --git a/skins/standard/fonts/FiraSans-Regular.woff b/skins/standard/fonts/FiraSans-Regular.woff
new file mode 100644 (file)
index 0000000..1ea1030
Binary files /dev/null and b/skins/standard/fonts/FiraSans-Regular.woff differ

diff --git a/skins/standard/fonts/FiraSans-Regular.woff2 b/skins/standard/fonts/FiraSans-Regular.woff2
new file mode 100644 (file)
index 0000000..7c87e06
Binary files /dev/null and b/skins/standard/fonts/FiraSans-Regular.woff2 differ

diff --git a/skins/standard/fonts/FiraSans-SemiBold.woff b/skins/standard/fonts/FiraSans-SemiBold.woff
new file mode 100644 (file)
index 0000000..ce680eb
Binary files /dev/null and b/skins/standard/fonts/FiraSans-SemiBold.woff differ

diff --git a/skins/standard/fonts/FiraSans-SemiBold.woff2 b/skins/standard/fonts/FiraSans-SemiBold.woff2
new file mode 100644 (file)
index 0000000..bd9cadb
Binary files /dev/null and b/skins/standard/fonts/FiraSans-SemiBold.woff2 differ

diff --git a/skins/standard/fonts/FiraSans-SemiBoldItalic.woff b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff
new file mode 100644 (file)
index 0000000..d45f8a4
Binary files /dev/null and b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff differ

diff --git a/skins/standard/fonts/FiraSans-SemiBoldItalic.woff2 b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff2
new file mode 100644 (file)
index 0000000..e38b7ed
Binary files /dev/null and b/skins/standard/fonts/FiraSans-SemiBoldItalic.woff2 differ

diff --git a/skins/standard/global.css b/skins/standard/global.css
index 9b9ae6550b1b446372f6fa7532ca64d34e0c99d0..a00839de93ac25f7869e03e01c55dc1f464a36f2 100644 (file)
--- 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;
 }

diff --git a/t/css.t b/t/css.t
index 84d1ae3f0ffb5c68918d9fef585be9a294117967..a64cadea6f3f329eb8b755881350d2b17051cf1f 100644 (file)
--- a/t/css.t
+++ b/t/css.t
@@ -22,7 +22,7 @@ find(
             if (/\.css$/) {
                 my $css_file = $File::Find::name;
                 my $content = read_file($_);
-                while ($content =~ m{url\(["']?([^\)"']+)['"]?\)}g) {
+                while ($content =~ m{url\(["']?([^\?\)"']+)(?:\?.+)?['"]?\)}g) {
                     my $file = $1;
                     my $file_rel_root = File::Spec->abs2rel(realpath(File::Spec->rel2abs($file)), $root);