diff --git a/Gulpfile.js b/Gulpfile.js index a329d2a..5fc6b5d 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -2,21 +2,8 @@ var gulp = require('gulp'); var iconfont = require('gulp-iconfont'); var iconfontCss = require('gulp-iconfont-css'); -String.prototype.toTitleCase = function() { - return this.replace(/\w\S*/g, function(txt){ return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); }); -}; - String.prototype.toCamelCase = function() { - var str = this.split('--'); - var result; - - if (str && str.length > 1) { - result = str[0] + str[1].toTitleCase(); - } else { - result = this; - } - - return result.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2, offset) { + return this.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2, offset) { if (p2) return p2.toUpperCase(); return p1.toLowerCase(); }); diff --git a/icon-font/font.sketch b/icon-font/font.sketch index ace8ed8..507e6f7 100644 Binary files a/icon-font/font.sketch and b/icon-font/font.sketch differ diff --git a/icon-font/svgs/icon-font_03_Heart--empty.svg b/icon-font/svgs/icon-font_03_HeartEmpty.svg similarity index 94% rename from icon-font/svgs/icon-font_03_Heart--empty.svg rename to icon-font/svgs/icon-font_03_HeartEmpty.svg index 047bd79..8d0a5bd 100644 --- a/icon-font/svgs/icon-font_03_Heart--empty.svg +++ b/icon-font/svgs/icon-font_03_HeartEmpty.svg @@ -1,12 +1,12 @@ - icon-font_03_Heart--empty + icon-font_03_HeartEmpty Created with Sketch. - + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_04_Heart--fill.svg b/icon-font/svgs/icon-font_04_HeartFill.svg similarity index 90% rename from icon-font/svgs/icon-font_04_Heart--fill.svg rename to icon-font/svgs/icon-font_04_HeartFill.svg index 6fa773d..164666e 100644 --- a/icon-font/svgs/icon-font_04_Heart--fill.svg +++ b/icon-font/svgs/icon-font_04_HeartFill.svg @@ -1,12 +1,12 @@ - icon-font_04_Heart--fill + icon-font_04_HeartFill Created with Sketch. - + \ No newline at end of file diff --git a/icon-font/svgs/icon-font_35_Unlock--withEllipsis.svg b/icon-font/svgs/icon-font_35_UnlockWithEllipsis.svg similarity index 93% rename from icon-font/svgs/icon-font_35_Unlock--withEllipsis.svg rename to icon-font/svgs/icon-font_35_UnlockWithEllipsis.svg index 9341f3c..0a452a5 100644 --- a/icon-font/svgs/icon-font_35_Unlock--withEllipsis.svg +++ b/icon-font/svgs/icon-font_35_UnlockWithEllipsis.svg @@ -1,12 +1,12 @@ - icon-font_35_Unlock--withEllipsis + icon-font_35_UnlockWithEllipsis Created with Sketch. - + \ No newline at end of file diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 3bc7df2..2955d09 100644 Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ diff --git a/src/fonts/cartoIcon.svg b/src/fonts/cartoIcon.svg index 47e72b1..478d3c8 100644 --- a/src/fonts/cartoIcon.svg +++ b/src/fonts/cartoIcon.svg @@ -13,10 +13,10 @@ - - - - -

unlockWithellipsis

+ +

unlockWithEllipsis

@@ -781,7 +781,7 @@ All available icons in CartoDB. } -.CDB-IconFont--unlockWithellipsis::before { +.CDB-IconFont--unlockWithEllipsis::before { content: '\E021'; }