Fixes conflicts

2016-01-22 11:58:46 +01:00
parent 890e3b76a8 7944b4aaa6
commit 1a8e5ff3bd
6 changed files with 27 additions and 3 deletions
--- a/src/fonts/cartoIcon.eot
+++ b/src/fonts/cartoIcon.eot
--- a/src/fonts/cartoIcon.ttf
+++ b/src/fonts/cartoIcon.ttf
--- a/src/fonts/cartoIcon.woff
+++ b/src/fonts/cartoIcon.woff
--- a/src/scss/cdb-icon-font.scss
+++ b/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.