From fb589083bc106184f762f369f3ef4792b3425e2b Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 22 Jan 2016 11:53:57 +0100 Subject: [PATCH 1/2] Adds namespace to font --- Gulpfile.js | 2 +- src/fonts/cartoIcon.eot | Bin 17808 -> 17808 bytes src/fonts/cartoIcon.ttf | Bin 17636 -> 17636 bytes src/fonts/cartoIcon.woff | Bin 11164 -> 11164 bytes ...{icon-font.css.scss => cdb-icon-font.scss} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename src/scss/{icon-font.css.scss => cdb-icon-font.scss} (100%) diff --git a/Gulpfile.js b/Gulpfile.js index 349413a..7b191a6 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -16,7 +16,7 @@ gulp.task('default', function(){ .pipe(iconfontCss({ fontName: 'cartoIcon', path: './icon-font/template.jst.ejs', - targetPath: '../scss/icon-font.css.scss', + targetPath: '../scss/cdb-icon-font.scss', fontPath: '../../fonts/' })) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index c199ab92804436beb5cc5254f1d96a921855d305..39f8a388f93423008089f675df205c61e09edc60 100644 GIT binary patch delta 55 zcmbQx%{T#wY?vz#+@5H^j=ArEedojOVxc%D~O|ivb8O9Y5g+qc<;L{NM}# Dkp>qG delta 55 zcmbQx%{T#wY?vQ@elXE~9dot$j)@op%AE=DyxB1Gz&G?G}2reBz;RvHQe)-@G0M%X-#Q*>R delta 47 wcmaFT$@rv`ae^arwfT;TE>oo+e0~_uZ}XLboADO|5L`M|oerZne)-@G0N8I6#Q*>R diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index b6857c07278df5a55671648f6f12a5cd0d1af321..f004e2d9bdb74e3cf805623dc9d87e25fd93cce0 100644 GIT binary patch delta 61 zcmV-D0K)&ASDaUnc>{gXY_WVwBq>{4CFA*RzA|t#{sM|HTsnTj5k|i$|NosUg7FWK T%fY||5(NN^Jr2XO?{YlxUqanBq{qZ8sqtGzA|t#{sM|HTsl^r4x`_c|NqVv!T1Nr T Date: Fri, 22 Jan 2016 11:54:15 +0100 Subject: [PATCH 2/2] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75316b3..645280d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.16", + "version": "0.1.17", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "xavijam",