diff --git a/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index f63d3a9..fd1e29f 100644 --- a/icon-font/template.jst.ejs +++ b/icon-font/template.jst.ejs @@ -3,11 +3,11 @@ @font-face { font-family: 'CartoIcon'; - src: url('fonts/cartoIcon.eot'); - src: url('fonts/cartoIcon.eot?#iefix') format('embedded-opentype'), - url('fonts/cartoIcon.woff') format('woff'), - url('fonts/cartoIcon.ttf') format('truetype'), - url('fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg'); + src: url('../fonts/cartoIcon.eot'); + src: url('../fonts/cartoIcon.eot?#iefix') format('embedded-opentype'), + url('../fonts/cartoIcon.woff') format('woff'), + url('../fonts/cartoIcon.ttf') format('truetype'), + url('../fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg'); font-weight: normal; font-style: normal; } diff --git a/package.json b/package.json index 0cce0b6..f5033a1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.13", + "version": "0.1.14", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam", diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 46adb8c..3e1ec5a 100644 Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index cb52e9c..3c43b13 100644 Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index c67069c..96e544f 100644 Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ diff --git a/src/scss/icon-font.css.scss b/src/scss/icon-font.css.scss index 0d1dd16..ddeeef6 100644 --- a/src/scss/icon-font.css.scss +++ b/src/scss/icon-font.css.scss @@ -3,11 +3,11 @@ @font-face { font-family: 'CartoIcon'; - src: url('fonts/cartoIcon.eot'); - src: url('fonts/cartoIcon.eot?#iefix') format('embedded-opentype'), - url('fonts/cartoIcon.woff') format('woff'), - url('fonts/cartoIcon.ttf') format('truetype'), - url('fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg'); + src: url('../fonts/cartoIcon.eot'); + src: url('../fonts/cartoIcon.eot?#iefix') format('embedded-opentype'), + url('../fonts/cartoIcon.woff') format('woff'), + url('../fonts/cartoIcon.ttf') format('truetype'), + url('../fonts/cartoIcon.svg?ey3vsq#cartoIcon') format('svg'); font-weight: normal; font-style: normal; } diff --git a/styleguide/_template.html b/styleguide/_template.html index 9dbb44d..f892cf2 100644 --- a/styleguide/_template.html +++ b/styleguide/_template.html @@ -1,5 +1,5 @@ - + {{> theme}} diff --git a/tasks/concat.js b/tasks/concat.js index 1c8846b..f97acac 100644 --- a/tasks/concat.js +++ b/tasks/concat.js @@ -2,7 +2,7 @@ module.exports = { dist: { options: {}, files: { - 'dist/cartostyles.css': [ + 'dist/css/cartostyles.css': [ '.tmp/src/scss/**/*.css' ] } diff --git a/tasks/cssmin.js b/tasks/cssmin.js index 27f4ee8..d960ae6 100644 --- a/tasks/cssmin.js +++ b/tasks/cssmin.js @@ -4,8 +4,8 @@ module.exports = { check: 'gzip' }, files: { - 'dist/cartostyles.css': [ - 'dist/cartostyles.css' + 'dist/css/cartostyles.css': [ + 'dist/css/cartostyles.css' ] } }