From 78ebf3d9a9bc666a5fbb211e8bad9d314d7b684b Mon Sep 17 00:00:00 2001 From: xavijam Date: Wed, 20 Jan 2016 18:29:22 +0100 Subject: [PATCH 1/2] Moving generated css to a css folder and changing all routes related with fonts due to this change --- icon-font/template.jst.ejs | 10 +++++----- src/fonts/cartoIcon.eot | Bin 17632 -> 17632 bytes src/fonts/cartoIcon.ttf | Bin 17460 -> 17460 bytes src/fonts/cartoIcon.woff | Bin 11040 -> 11040 bytes src/scss/icon-font.css.scss | 10 +++++----- styleguide/_template.html | 2 +- tasks/concat.js | 2 +- tasks/cssmin.js | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index eb570d3..9600d44 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/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 9bf2cc3e12de690f8a64f05eea3d652258d2ae94..c707c1bf8336a2d15cf7de2a26646f1b3f7dd7ff 100644 GIT binary patch delta 55 zcmaFR$@rj?ae@u=!LZJW_Uo7{U1KJGm@3^Fb}*jb<|_j?<1YpvxOBA15=L)c!06x% E0B=kb&;S4c delta 55 zcmaFR$@rj?ae@uAF0~A`F*~Hd(^xH|77o Zb44)z0dhGQm_VWcRsRh}0JDE2p$5z+9ESh^ delta 67 zcmV-J0KEU8R-jgpa|ts5001`obOSK4eA*)^Ntf2f^V@u7;AZ><6k)h@=%F% - + {{> 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' ] } } From 1fa5bb65c344b230dabdf660a28d67cce7f827a3 Mon Sep 17 00:00:00 2001 From: xavijam Date: Wed, 20 Jan 2016 18:45:58 +0100 Subject: [PATCH 2/2] New package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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",