From f92109cbdbc138d1f0934aa91878f1f1d17f458f Mon Sep 17 00:00:00 2001 From: Javier Arce Date: Fri, 22 Jan 2016 18:39:44 +0100 Subject: [PATCH] Fixes case of some icons --- Gulpfile.js | 16 ++++++++++++++-- package.json | 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 src/scss/cdb-icon-font.scss | 18 +++++++++--------- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Gulpfile.js b/Gulpfile.js index 7b191a6..a329d2a 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -2,9 +2,21 @@ 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.replace('--', ''); - return str.replace(/^([A-Z])|\s(\w)/g, function(match, p1, p2, offset) { + 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) { if (p2) return p2.toUpperCase(); return p1.toLowerCase(); }); diff --git a/package.json b/package.json index e629759..3c981c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.19", + "version": "0.1.20", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 887caac99fec28a32ebaa6262222bb6b13fa049a..3bc7df222162d04ed858f99bd541fc979d69e5a4 100644 GIT binary patch delta 55 zcmbQx%{T#wY?voH-I{2>j=63^!o&|#rEfV+jOVxc%D~O|ivb8OolxHmqc<;L{NM}# DV*wSW delta 55 zcmbQx%{T#wY?x2(ygku=9dqrKBNIPNmA<|6WIVskR|amzUkpHS>G;XFFnaR>#t+T_ D!D1Ox diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 2cfff3c297a5dd29c37ac87c495fe7d659e1c7b0..2a4e853ce957fe931a614a163a226d1559e57034 100644 GIT binary patch delta 47 wcmaFT$@rv`ae^ar-GqdRE>op%IZce`xB1Gz&G?G}2riva-wmTTe)-@G0J>Td#sB~S delta 47 wcmaFT$@rv`ae^ar?Uf@FU8YLk-gz>f-{va=H{&k`Ah>k={isV6l8kBq^KbhVlG1Um3U=e*r}pE}c-{4Wr+b|NqVv!T1Nr T{ga#IbxzBq>|#GUNGezA|t#{sM|HTsnU8EsTCs{{K5y1mhnd TmxF-`Bnkkxkq~CH? - -

heartempty

+ +

heartEmpty

- -

heartfill

+ +

heartFill

@@ -234,8 +234,8 @@ All available icons in CartoDB.
- -

unlockwithEllipsis

+ +

unlockWithellipsis

@@ -631,12 +631,12 @@ All available icons in CartoDB. } -.CDB-IconFont--heartempty::before { +.CDB-IconFont--heartEmpty::before { content: '\E003'; } -.CDB-IconFont--heartfill::before { +.CDB-IconFont--heartFill::before { content: '\E004'; } @@ -781,7 +781,7 @@ All available icons in CartoDB. } -.CDB-IconFont--unlockwithEllipsis::before { +.CDB-IconFont--unlockWithellipsis::before { content: '\E021'; }