Fixes conflicts

icon-font/template.jst.ejs

@@ -1,6 +1,8 @@
 // Icon font elements
 // ----------------------------------------------
 
+@import "cdb-variables/sizes";
+
 @font-face {
   font-family: 'CartoIcon';
   src: url('../fonts/cartoIcon.eot');
@@ -22,6 +24,16 @@
   line-height: 1;
 }
 
+.CDB-IconFont--center {
+  vertical-align: middle;
+}
+.CDB-IconFont--top {
+  vertical-align: top;
+}
+.CDB-IconFont--small {
+  font-size: $sFontSize-small + 1;
+}
+
 /* SG
 # Typography/Icon font
 All available icons in CartoDB.

package.json

@@ -1,11 +1,11 @@
 {
   "name": "cartoassets",
   "description": "Share frontend assets between different CartoDB repositories",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "homepage": "https://github.com/cartodb/CartoAssets",
   "author": {
-    "name": "xavijam",
-    "email": "xavijam@gmail.com"
+    "name": "CartoDB",
+    "email": "contact@cartodb.com"
   },
   "contributors": [
     "Javier Álvarez <jmedina@cartodb.com>",

src/scss/cdb-icon-font.scss

@@ -1,6 +1,8 @@
 // Icon font elements
 // ----------------------------------------------
 
+@import "cdb-variables/sizes";
+
 @font-face {
   font-family: 'CartoIcon';
   src: url('../fonts/cartoIcon.eot');
@@ -22,6 +24,16 @@
   line-height: 1;
 }
 
+.CDB-IconFont--center {
+  vertical-align: middle;
+}
+.CDB-IconFont--top {
+  vertical-align: top;
+}
+.CDB-IconFont--small {
+  font-size: $sFontSize-small + 1;
+}
+
 /* SG
 # Typography/Icon font
 All available icons in CartoDB.