diff --git a/README.md b/README.md index b62eff5..a69e5f3 100644 --- a/README.md +++ b/README.md @@ -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 @@ -43,4 +43,4 @@ Just run this command: ![Chrome](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/archive/chrome_12-48/chrome_12-48_48x48.png) | ![Firefox](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/archive/firefox_1.5-3/firefox_1.5-3_48x48.png) | ![IE](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/edge-tile/edge-tile_48x48.png) | ![Opera](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/opera/opera_48x48.png) | ![Safari](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/safari/safari_48x48.png) --- | --- | --- | --- | --- | -31+ ✔ | 38+ ✔ | 11+ ✔ | 31+ ✔ | 8+ ✔ | \ No newline at end of file +31+ ✔ | 38+ ✔ | 11+ ✔ | 31+ ✔ | 8+ ✔ | diff --git a/src/fonts/Montserrat-Bold.eot b/src/fonts/Montserrat-Bold.eot new file mode 100644 index 0000000..b5b8376 Binary files /dev/null and b/src/fonts/Montserrat-Bold.eot differ diff --git a/src/fonts/Montserrat-Bold.ttf b/src/fonts/Montserrat-Bold.ttf new file mode 100644 index 0000000..5f62df5 Binary files /dev/null and b/src/fonts/Montserrat-Bold.ttf differ diff --git a/src/fonts/Montserrat-Bold.woff b/src/fonts/Montserrat-Bold.woff new file mode 100644 index 0000000..32412b8 Binary files /dev/null and b/src/fonts/Montserrat-Bold.woff differ diff --git a/src/fonts/Montserrat-Regular.eot b/src/fonts/Montserrat-Regular.eot new file mode 100644 index 0000000..97c34cd Binary files /dev/null and b/src/fonts/Montserrat-Regular.eot differ diff --git a/src/fonts/Montserrat-Regular.ttf b/src/fonts/Montserrat-Regular.ttf new file mode 100755 index 0000000..2a2b2aa Binary files /dev/null and b/src/fonts/Montserrat-Regular.ttf differ diff --git a/src/fonts/Montserrat-Regular.woff b/src/fonts/Montserrat-Regular.woff new file mode 100644 index 0000000..c85df48 Binary files /dev/null and b/src/fonts/Montserrat-Regular.woff differ diff --git a/src/fonts/Montserrat-Semibold.eot b/src/fonts/Montserrat-Semibold.eot new file mode 100644 index 0000000..864c52c Binary files /dev/null and b/src/fonts/Montserrat-Semibold.eot differ diff --git a/src/fonts/Montserrat-Semibold.ttf b/src/fonts/Montserrat-Semibold.ttf new file mode 100755 index 0000000..0ecc667 Binary files /dev/null and b/src/fonts/Montserrat-Semibold.ttf differ diff --git a/src/fonts/Montserrat-Semibold.woff b/src/fonts/Montserrat-Semibold.woff new file mode 100644 index 0000000..9bca22d Binary files /dev/null and b/src/fonts/Montserrat-Semibold.woff differ diff --git a/src/scss/cdb-utilities/_fonts.scss b/src/scss/cdb-utilities/_fonts.scss index 8c8bf83..80f6aad 100644 --- a/src/scss/cdb-utilities/_fonts.scss +++ b/src/scss/cdb-utilities/_fonts.scss @@ -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'); +}