Commit: 78286b7a10176b07391e75e4d581b58970d4489f
Author: Levi Morrison <le...@php.net> Tue, 27 May 2014 13:19:13 -0600
Parents: b374d5b6f45c60011c25a344760e32f38199cc13
Branches: master
Link:
http://git.php.net/?p=web/php.git;a=commitdiff;h=78286b7a10176b07391e75e4d581b58970d4489f
Log:
Font URLs are now relative to root; cached.php was breaking the relative URLs.
Changed paths:
M fonts/Fira/fira.css
diff --git a/fonts/Fira/fira.css b/fonts/Fira/fira.css
index 40ac8f8..3abcf03 100644
--- a/fonts/Fira/fira.css
+++ b/fonts/Fira/fira.css
@@ -1,198 +1,198 @@
/*
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-Hair.eot');
- src: local('Fira Sans Hair'),
- url('eot/FiraSans-Hair.eot') format('embedded-opentype'),
- url('woff/FiraSans-Hair.woff') format('woff'),
- url('ttf/FiraSans-Hair.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-Hair.eot');
+ src: local('/fonts/Fira/Fira Sans Hair'),
+ url('/fonts/Fira/eot/FiraSans-Hair.eot') format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-Hair.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-Hair.ttf') format('truetype');
font-weight: 100;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-HairItalic.eot');
- src: local('Fira Sans Hair Italic'),
- url('eot/FiraSans-HairItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-HairItalic.woff') format('woff'),
- url('ttf/FiraSans-HairItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-HairItalic.eot');
+ src: local('/fonts/Fira/Fira Sans Hair Italic'),
+ url('/fonts/Fira/eot/FiraSans-HairItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-HairItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-HairItalic.ttf') format('truetype');
font-weight: 100;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-UltraLight.eot');
- src: local('Fira Sans UltraLight'),
- url('eot/FiraSans-UltraLight.eot') format('embedded-opentype'),
- url('woff/FiraSans-UltraLight.woff') format('woff'),
- url('ttf/FiraSans-UltraLight.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-UltraLight.eot');
+ src: local('/fonts/Fira/Fira Sans UltraLight'),
+ url('/fonts/Fira/eot/FiraSans-UltraLight.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-UltraLight.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-UltraLight.ttf') format('truetype');
font-weight: 200;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-UltraLightItalic.eot');
- src: local('Fira Sans UltraLight Italic'),
- url('eot/FiraSans-UltraLightItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-UltraLightItalic.woff') format('woff'),
- url('ttf/FiraSans-UltraLightItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-UltraLightItalic.eot');
+ src: local('/fonts/Fira/Fira Sans UltraLight Italic'),
+ url('/fonts/Fira/eot/FiraSans-UltraLightItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-UltraLightItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-UltraLightItalic.ttf')
format('truetype');
font-weight: 200;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-Light.eot');
- src: local('Fira Sans Light'),
- url('eot/FiraSans-Light.eot') format('embedded-opentype'),
- url('woff/FiraSans-Light.woff') format('woff'),
- url('ttf/FiraSans-Light.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-Light.eot');
+ src: local('/fonts/Fira/Fira Sans Light'),
+ url('/fonts/Fira/eot/FiraSans-Light.eot') format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-Light.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-LightItalic.eot');
- src: local('Fira Sans Light Italic'),
- url('eot/FiraSans-LightItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-LightItalic.woff') format('woff'),
- url('ttf/FiraSans-LightItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-LightItalic.eot');
+ src: local('/fonts/Fira/Fira Sans Light Italic'),
+ url('/fonts/Fira/eot/FiraSans-LightItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-LightItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
*/
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-Book.eot');
- src: local('Fira Sans Regular'),
- url('eot/FiraSans-Book.eot') format('embedded-opentype'),
- url('woff/FiraSans-Book.woff') format('woff'),
- url('ttf/FiraSans-Book.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-Book.eot');
+ src: local('/fonts/Fira/Fira Sans Regular'),
+ url('/fonts/Fira/eot/FiraSans-Book.eot') format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-Book.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-Book.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-BookItalic.eot');
- src: local('Fira Sans Regular Italic'),
- url('eot/FiraSans-BookItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-BookItalic.woff') format('woff'),
- url('ttf/FiraSans-BookItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-BookItalic.eot');
+ src: local('/fonts/Fira/Fira Sans Regular Italic'),
+ url('/fonts/Fira/eot/FiraSans-BookItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-BookItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-BookItalic.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-Medium.eot');
- src: local('Fira Sans Medium'),
- url('eot/FiraSans-Medium.eot') format('embedded-opentype'),
- url('woff/FiraSans-Medium.woff') format('woff'),
- url('ttf/FiraSans-Medium.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-Medium.eot');
+ src: local('/fonts/Fira/Fira Sans Medium'),
+ url('/fonts/Fira/eot/FiraSans-Medium.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-Medium.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-Medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-MediumItalic.eot');
- src: local('Fira Sans Medium Italic'),
- url('eot/FiraSans-MediumItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-MediumItalic.woff') format('woff'),
- url('ttf/FiraSans-MediumItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-MediumItalic.eot');
+ src: local('/fonts/Fira/Fira Sans Medium Italic'),
+ url('/fonts/Fira/eot/FiraSans-MediumItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-MediumItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-MediumItalic.ttf') format('truetype');
font-weight: 500;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-SemiBold.eot');
- src: local('Fira Sans SemiBold'),
- url('eot/FiraSans-SemiBold.eot') format('embedded-opentype'),
- url('woff/FiraSans-SemiBold.woff') format('woff'),
- url('ttf/FiraSans-SemiBold.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-SemiBold.eot');
+ src: local('/fonts/Fira/Fira Sans SemiBold'),
+ url('/fonts/Fira/eot/FiraSans-SemiBold.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-SemiBold.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-SemiBold.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-SemiBoldItalic.eot');
- src: local('Fira Sans SemiBold Italic'),
- url('eot/FiraSans-SemiBoldItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-SemiBoldItalic.woff') format('woff'),
- url('ttf/FiraSans-SemiBoldItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-SemiBoldItalic.eot');
+ src: local('/fonts/Fira/Fira Sans SemiBold Italic'),
+ url('/fonts/Fira/eot/FiraSans-SemiBoldItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-SemiBoldItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-SemiBoldItalic.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-Bold.eot');
- src: local('Fira Sans Bold'),
- url('eot/FiraSans-Bold.eot') format('embedded-opentype'),
- url('woff/FiraSans-Bold.woff') format('woff'),
- url('ttf/FiraSans-Bold.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-Bold.eot');
+ src: local('/fonts/Fira/Fira Sans Bold'),
+ url('/fonts/Fira/eot/FiraSans-Bold.eot') format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-Bold.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-Bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-BoldItalic.eot');
- src: local('Fira Sans Bold Italic'),
- url('eot/FiraSans-BoldItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-BoldItalic.woff') format('woff'),
- url('ttf/FiraSans-BoldItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-BoldItalic.eot');
+ src: local('/fonts/Fira/Fira Sans Bold Italic'),
+ url('/fonts/Fira/eot/FiraSans-BoldItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-BoldItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-BoldItalic.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
/*
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-ExtraBold.eot');
- src: local('Fira Sans ExtraBold'),
- url('eot/FiraSans-ExtraBold.eot') format('embedded-opentype'),
- url('woff/FiraSans-ExtraBold.woff') format('woff'),
- url('ttf/FiraSans-ExtraBold.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-ExtraBold.eot');
+ src: local('/fonts/Fira/Fira Sans ExtraBold'),
+ url('/fonts/Fira/eot/FiraSans-ExtraBold.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-ExtraBold.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-ExtraBold.ttf') format('truetype');
font-weight: 800;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-ExtraBoldItalic.eot');
- src: local('Fira Sans ExtraBold Italic'),
- url('eot/FiraSans-ExtraBoldItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-ExtraBoldItalic.woff') format('woff'),
- url('ttf/FiraSans-ExtraBoldItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-ExtraBoldItalic.eot');
+ src: local('/fonts/Fira/Fira Sans ExtraBold Italic'),
+ url('/fonts/Fira/eot/FiraSans-ExtraBoldItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-ExtraBoldItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-ExtraBoldItalic.ttf')
format('truetype');
font-weight: 800;
font-style: italic;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-Heavy.eot');
- src: local('Fira Sans Heavy'),
- url('eot/FiraSans-Heavy.eot') format('embedded-opentype'),
- url('woff/FiraSans-Heavy.woff') format('woff'),
- url('ttf/FiraSans-Heavy.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-Heavy.eot');
+ src: local('/fonts/Fira/Fira Sans Heavy'),
+ url('/fonts/Fira/eot/FiraSans-Heavy.eot') format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-Heavy.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-Heavy.ttf') format('truetype');
font-weight: 900;
font-style: normal;
}
@font-face{
font-family: 'Fira Sans';
- src: url('eot/FiraSans-HeavyItalic.eot');
- src: local('Fira Sans Heavy Italic'),
- url('eot/FiraSans-HeavyItalic.eot') format('embedded-opentype'),
- url('woff/FiraSans-HeavyItalic.woff') format('woff'),
- url('ttf/FiraSans-HeavyItalic.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraSans-HeavyItalic.eot');
+ src: local('/fonts/Fira/Fira Sans Heavy Italic'),
+ url('/fonts/Fira/eot/FiraSans-HeavyItalic.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraSans-HeavyItalic.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraSans-HeavyItalic.ttf') format('truetype');
font-weight: 900;
font-style: italic;
}
@@ -200,22 +200,22 @@
@font-face{
font-family: 'Fira Mono';
- src: url('eot/FiraMono-Regular.eot');
- src: local('Fira Mono'),
- url('eot/FiraMono-Regular.eot') format('embedded-opentype'),
- url('woff/FiraMono-Regular.woff') format('woff'),
- url('ttf/FiraMono-Regular.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraMono-Regular.eot');
+ src: local('/fonts/Fira/Fira Mono'),
+ url('/fonts/Fira/eot/FiraMono-Regular.eot')
format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraMono-Regular.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraMono-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face{
font-family: 'Fira Mono';
- src: url('eot/FiraMono-Bold.eot');
- src: local('Fira Mono Bold'),
- url('eot/FiraMono-Bold.eot') format('embedded-opentype'),
- url('woff/FiraMono-Bold.woff') format('woff'),
- url('ttf/FiraMono-Bold.ttf') format('truetype');
+ src: url('/fonts/Fira/eot/FiraMono-Bold.eot');
+ src: local('/fonts/Fira/Fira Mono Bold'),
+ url('/fonts/Fira/eot/FiraMono-Bold.eot') format('embedded-opentype'),
+ url('/fonts/Fira/woff/FiraMono-Bold.woff') format('woff'),
+ url('/fonts/Fira/ttf/FiraMono-Bold.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
