diff --git a/.htaccess b/.htaccess index 9cd1b0cfb..72f6973d4 100644 --- a/.htaccess +++ b/.htaccess @@ -28,7 +28,7 @@ Header unset Vary env=BINGBOT RewriteCond %{HTTP_HOST} ^www\.play\.pokemonshowdown\.com$ [NC] RewriteRule ^(.*) http%{ENV:P_SUFFIX}://play.pokemonshowdown.com/$1 [R=301,L] -RewriteRule ^style/font/.*?\.(eot|svg|ttf|woff)$ - [E=SAFE_RESOURCE:1] +RewriteRule ^style/fonts?/.*?\.(eot|svg|ttf|woff|woff2)$ - [E=SAFE_RESOURCE:1] Header set Access-Control-Allow-Origin * env=SAFE_RESOURCE # Redirect old battles to their corresponding replay diff --git a/style/font-awesome.css b/style/font-awesome.css index 8494759ca..bbcb49562 100644 --- a/style/font-awesome.css +++ b/style/font-awesome.css @@ -6,8 +6,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('fonts/fontawesome-webfont.eot?v=4.4.0'); - src: url('fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg'); + src: url('font/fontawesome-webfont.eot?v=4.4.0'); + src: url('font/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('font/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('font/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('font/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('font/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/style/font/FontAwesome.otf b/style/font/FontAwesome.otf new file mode 100644 index 000000000..681bdd4d4 Binary files /dev/null and b/style/font/FontAwesome.otf differ diff --git a/style/font/fontawesome-webfont.eot b/style/font/fontawesome-webfont.eot new file mode 100644 index 000000000..a30335d74 Binary files /dev/null and b/style/font/fontawesome-webfont.eot differ diff --git a/style/font/fontawesome-webfont.svg b/style/font/fontawesome-webfont.svg new file mode 100644 index 000000000..6fd19abcb --- /dev/null +++ b/style/font/fontawesome-webfont.svg @@ -0,0 +1,640 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/style/font/fontawesome-webfont.ttf b/style/font/fontawesome-webfont.ttf new file mode 100644 index 000000000..d7994e130 Binary files /dev/null and b/style/font/fontawesome-webfont.ttf differ diff --git a/style/font/fontawesome-webfont.woff b/style/font/fontawesome-webfont.woff new file mode 100644 index 000000000..6fd4ede0f Binary files /dev/null and b/style/font/fontawesome-webfont.woff differ diff --git a/style/font/fontawesome-webfont.woff2 b/style/font/fontawesome-webfont.woff2 new file mode 100644 index 000000000..5560193cc Binary files /dev/null and b/style/font/fontawesome-webfont.woff2 differ