Merge pull request #204 from CartoDB/203-montserrat-font

Add Montserrat font family
This commit is contained in:
Víctor Velarde 2018-08-20 13:08:07 +02:00 committed by GitHub
commit df7bedd062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 32 additions and 2 deletions

View File

@ -17,7 +17,7 @@ If you want to use any of the CartoAssets components, after the installation jus
It will generate a UI documentation about the components in this repository:
- ```grunt dev```
If you want to check the documenation, it is generated in the ```dist``` folder.
If you want to check the documentation, it is generated in the ```dist``` folder.
### How to add/update the icon font

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
src/fonts/Montserrat-Regular.ttf Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
src/fonts/Montserrat-Semibold.ttf Executable file

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,7 @@
// Fonts
// --------------------------------------------------
// Open Sans
@font-face {
font-family: 'Open Sans';
font-style: normal;
@ -28,3 +29,32 @@
url('../fonts/OpenSans-Semibold.woff') format('woff'),
url('../fonts/OpenSans-Semibold.ttf') format('truetype');
}
// Montserrat
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 400;
src: url('../fonts/Montserrat-Regular.eot');
src: url('../fonts/Montserrat-Regular.eot?#iefix') format('embedded-opentype'),
url('../fonts/Montserrat-Regular.woff') format('woff'),
url('../fonts/Montserrat-Regular.ttf') format('truetype');
}
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 600;
src: url('../fonts/Montserrat-Semibold.eot');
src: url('../fonts/Montserrat-Semibold.eot?#iefix') format('embedded-opentype'),
url('../fonts/Montserrat-Semibold.woff') format('woff'),
url('../fonts/Montserrat-Semibold.ttf') format('truetype');
}
@font-face {
font-family: 'Montserrat';
font-style: normal;
font-weight: 700;
src: url('../fonts/Montserrat-Bold.eot');
src: url('../fonts/Montserrat-Bold.eot?#iefix') format('embedded-opentype'),
url('../fonts/Montserrat-Bold.woff') format('woff'),
url('../fonts/Montserrat-Bold.ttf') format('truetype');
}