cartodb/CartoAssets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140 from CartoDB/fix-load-fonts

Browse Source 
change fonts
This commit is contained in:
piensaenpixel 2016-06-29 09:55:16 +02:00 committed by GitHub
commit abdf5ce056
10 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/fonts/OpenSans-Light.eot Normal file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Light.ttf Executable file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Light.woff Normal file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Regular.eot Normal file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Regular.ttf Executable file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Regular.woff Normal file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Semibold.eot Normal file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Semibold.ttf Executable file
View File

Binary file not shown.

BIN
src/fonts/OpenSans-Semibold.woff Normal file
View File

Binary file not shown.

19
src/scss/cdb-utilities/fonts.scss
View File

@ -1,25 +1,30 @@
// Fonts // Fonts
// - They are being loaded from Google fonts
// -------------------------------------------------- // --------------------------------------------------
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), src: url('../fonts/OpenSans-Light.eot');
url('//themes.googleusercontent.com/static/fonts/opensans/v8/DXI1ORHCpsQm3Vp6mXoaTeY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); src: url('../fonts/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Light.woff') format('woff'),
url('../fonts/OpenSans-Light.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), src: url('../fonts/OpenSans-Regular.eot');
url('//themes.googleusercontent.com/static/fonts/opensans/v8/u-WUoqrET9fUeobQW7jkRbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); src: url('../fonts/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Regular.woff') format('woff'),
url('../fonts/OpenSans-Regular.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('//themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), src: url('../fonts/OpenSans-Semibold.eot');
url('//themes.googleusercontent.com/static/fonts/opensans/v8/MTP_ySUJH_bn48VBG8sNSuY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); src: url('../fonts/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
url('../fonts/OpenSans-Semibold.woff') format('woff'),
url('../fonts/OpenSans-Semibold.ttf') format('truetype');
} }