merged from develop_2.0

This commit is contained in:
Tony Tam
2015-02-01 02:27:43 -08:00
parent 1be0f9fa35
commit 038443fc22
87 changed files with 11991 additions and 14394 deletions

26
dist/css/typography.css vendored Normal file
View File

@@ -0,0 +1,26 @@
/* droid-sans-regular - latin */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 400;
src: url('../fonts/droid-sans-v6-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Droid Sans'), local('DroidSans'),
url('../fonts/droid-sans-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/droid-sans-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/droid-sans-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../fonts/droid-sans-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/droid-sans-v6-latin-regular.svg#DroidSans') format('svg'); /* Legacy iOS */
}
/* droid-sans-700 - latin */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: 700;
src: url('../fonts/droid-sans-v6-latin-700.eot'); /* IE9 Compat Modes */
src: local('Droid Sans Bold'), local('DroidSans-Bold'),
url('../fonts/droid-sans-v6-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/droid-sans-v6-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/droid-sans-v6-latin-700.woff') format('woff'), /* Modern Browsers */
url('../fonts/droid-sans-v6-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/droid-sans-v6-latin-700.svg#DroidSans') format('svg'); /* Legacy iOS */
}