Commit c09e4ae0 authored by Eugen Rochko's avatar Eugen Rochko

Merge branch 'master' into 'master'

use local fonts/icon files rather than CDN

See merge request mastodon/joinmastodon!52
parents f1c10af2 cc24ef8c
......@@ -18,3 +18,5 @@ yarn-error.log*
# no CSSerino
src/**/*.css
!src/fonts/fonts.css
!src/fonts/ionicons.min.css
/* quando-regular - latin */
@font-face {
font-family: 'Quando';
font-style: normal;
font-weight: 400;
src: url('./quando-v7-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Quando-Regular'),
url('./quando-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./quando-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('./quando-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
url('./quando-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('./quando-v7-latin-regular.svg#Quando') format('svg'); /* Legacy iOS */
}
/* judson-regular - latin */
@font-face {
font-family: 'Judson';
font-style: normal;
font-weight: 400;
src: url('./judson-v11-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Judson Regular'), local('Judson-Regular'),
url('./judson-v11-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./judson-v11-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('./judson-v11-latin-regular.woff') format('woff'), /* Modern Browsers */
url('./judson-v11-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('./judson-v11-latin-regular.svg#Judson') format('svg'); /* Legacy iOS */
}
/* montserrat-regular - latin */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('./montserrat-v12-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Montserrat Regular'), local('Montserrat-Regular'),
url('./montserrat-v12-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./montserrat-v12-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('./montserrat-v12-latin-regular.woff') format('woff'), /* Modern Browsers */
url('./montserrat-v12-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('./montserrat-v12-latin-regular.svg#Montserrat') format('svg'); /* Legacy iOS */
}
/* montserrat-600 - latin */
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 600;
src: url('./montserrat-v12-latin-600.eot'); /* IE9 Compat Modes */
src: local('Montserrat SemiBold'), local('Montserrat-SemiBold'),
url('./montserrat-v12-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./montserrat-v12-latin-600.woff2') format('woff2'), /* Super Modern Browsers */
url('./montserrat-v12-latin-600.woff') format('woff'), /* Modern Browsers */
url('./montserrat-v12-latin-600.ttf') format('truetype'), /* Safari, Android, iOS */
url('./montserrat-v12-latin-600.svg#Montserrat') format('svg'); /* Legacy iOS */
}
/* roboto-regular - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('./roboto-v18-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Roboto'), local('Roboto-Regular'),
url('./roboto-v18-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./roboto-v18-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('./roboto-v18-latin-regular.woff') format('woff'), /* Modern Browsers */
url('./roboto-v18-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('./roboto-v18-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
}
/* roboto-500 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: url('./roboto-v18-latin-500.eot'); /* IE9 Compat Modes */
src: local('Roboto Medium'), local('Roboto-Medium'),
url('./roboto-v18-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./roboto-v18-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
url('./roboto-v18-latin-500.woff') format('woff'), /* Modern Browsers */
url('./roboto-v18-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
url('./roboto-v18-latin-500.svg#Roboto') format('svg'); /* Legacy iOS */
}
/* roboto-700 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: url('./roboto-v18-latin-700.eot'); /* IE9 Compat Modes */
src: local('Roboto Bold'), local('Roboto-Bold'),
url('./roboto-v18-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./roboto-v18-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('./roboto-v18-latin-700.woff') format('woff'), /* Modern Browsers */
url('./roboto-v18-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('./roboto-v18-latin-700.svg#Roboto') format('svg'); /* Legacy iOS */
}
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
@import url('https://fonts.googleapis.com/css?family=Quando|Judson|Montserrat:400,600|Roboto:400,500,700');
@import url('https://unpkg.com/ionicons@4.2.0/dist/css/ionicons.min.css');
//@import url('https://fonts.googleapis.com/css?family=Quando|Judson|Montserrat:400,600|Roboto:400,500,700');
//@import url('https://unpkg.com/ionicons@4.2.0/dist/css/ionicons.min.css');
@import 'fonts/fonts.css';
@import 'fonts/ionicons.min.css';
@import 'scss/variables.scss';
@import 'scss/reset.scss';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment