diff --git a/Gulpfile.js b/Gulpfile.js index 7b191a6..5fc6b5d 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -3,8 +3,7 @@ var iconfont = require('gulp-iconfont'); var iconfontCss = require('gulp-iconfont-css'); String.prototype.toCamelCase = function() { - var str = this.replace('--', ''); - return str.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/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index d52b624..9b2eadc 100644 --- a/icon-font/template.jst.ejs +++ b/icon-font/template.jst.ejs @@ -42,7 +42,7 @@ All available icons in CartoDB. <% _.each(glyphs, function(glyph) { %> <% var name = glyph.fileName.split("_")[2].toCamelCase(); %>
- +

<%= name %>

<% }); %> @@ -51,7 +51,7 @@ All available icons in CartoDB. <% _.each(glyphs, function(glyph) { %> <% var name = glyph.fileName.split("_")[2].toCamelCase(); %> -.CDB-IconFont--<%= name %>::before { +.CDB-IconFont-<%= name %>::before { content: '\<%= glyph.codePoint %>'; } <% }); %> 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 887caac..ed2175b 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 @@ - - - - +

clock

- +

stats

- -

heartempty

+ +

heartEmpty

- -

heartfill

+ +

heartFill

- +

alert

- +

rows

- +

check

- +

dribbble

- +

twitter

- +

wizard

- +

info

- +

fork

- +

facebook

- +

folder

- +

dropbox

- +

cloud

- +

step

- +

addDocument

- +

arrowNext

- +

arrowPrev

- +

close

- +

cartoFante

- +

lock

- +

cartoDB

- +

lens

- +

closeLimits

- +

defaultUser

- +

cockroach

- +

floppy

- +

trash

- +

wifi

- +

unlock

- -

unlockwithEllipsis

+ +

unlockWithEllipsis

- +

gift

- +

people

- +

play

- +

add

- +

map

- +

anchor

- +

key

- +

calendar

- +

document

- +

eye

- +

marker

- +

progressBar

- +

book

- +

notes

- +

rectangles

- +

mountain

- +

points

- +

snake

- +

boss

- +

rocket

- +

barometer

- +

dollar

- +

email

- +

label

- +

outside

- +

jigsaw

- +

tools

- +

question

- +

layerStack

- +

alarm

- +

cloudDownArrow

- +

pencil

- +

fountainPen

- +

emptyDoc

- +

mergeArrow

- +

mergeColumns

- +

mergeSpatial

- +

globe

- +

chevronDown

- +

streets

- +

keys

- +

facebookSquare

- +

fullscreen

- +

rarrow

- +

share

- +

linkedin

- +

calendarBlank

- +

creativeCommons

- +

bubble

- +

bars

- +

arrowMenu

- +

tieFighter

- +

ray

- +

markup

- +

table

- +

airlock

- +

pin

- +

attache

- +

download

- +

group

- +

dashboard

- +

spinner

- +

drop

@@ -621,481 +621,481 @@ All available icons in CartoDB. -.CDB-IconFont--clock::before { +.CDB-IconFont-clock::before { content: '\E001'; } -.CDB-IconFont--stats::before { +.CDB-IconFont-stats::before { content: '\E002'; } -.CDB-IconFont--heartempty::before { +.CDB-IconFont-heartEmpty::before { content: '\E003'; } -.CDB-IconFont--heartfill::before { +.CDB-IconFont-heartFill::before { content: '\E004'; } -.CDB-IconFont--alert::before { +.CDB-IconFont-alert::before { content: '\E005'; } -.CDB-IconFont--rows::before { +.CDB-IconFont-rows::before { content: '\E006'; } -.CDB-IconFont--check::before { +.CDB-IconFont-check::before { content: '\E007'; } -.CDB-IconFont--dribbble::before { +.CDB-IconFont-dribbble::before { content: '\E008'; } -.CDB-IconFont--twitter::before { +.CDB-IconFont-twitter::before { content: '\E009'; } -.CDB-IconFont--wizard::before { +.CDB-IconFont-wizard::before { content: '\E00A'; } -.CDB-IconFont--info::before { +.CDB-IconFont-info::before { content: '\E00B'; } -.CDB-IconFont--fork::before { +.CDB-IconFont-fork::before { content: '\E00C'; } -.CDB-IconFont--facebook::before { +.CDB-IconFont-facebook::before { content: '\E00D'; } -.CDB-IconFont--folder::before { +.CDB-IconFont-folder::before { content: '\E00E'; } -.CDB-IconFont--dropbox::before { +.CDB-IconFont-dropbox::before { content: '\E00F'; } -.CDB-IconFont--cloud::before { +.CDB-IconFont-cloud::before { content: '\E010'; } -.CDB-IconFont--step::before { +.CDB-IconFont-step::before { content: '\E011'; } -.CDB-IconFont--addDocument::before { +.CDB-IconFont-addDocument::before { content: '\E012'; } -.CDB-IconFont--arrowNext::before { +.CDB-IconFont-arrowNext::before { content: '\E013'; } -.CDB-IconFont--arrowPrev::before { +.CDB-IconFont-arrowPrev::before { content: '\E014'; } -.CDB-IconFont--close::before { +.CDB-IconFont-close::before { content: '\E015'; } -.CDB-IconFont--cartoFante::before { +.CDB-IconFont-cartoFante::before { content: '\E016'; } -.CDB-IconFont--lock::before { +.CDB-IconFont-lock::before { content: '\E017'; } -.CDB-IconFont--cartoDB::before { +.CDB-IconFont-cartoDB::before { content: '\E018'; } -.CDB-IconFont--lens::before { +.CDB-IconFont-lens::before { content: '\E019'; } -.CDB-IconFont--closeLimits::before { +.CDB-IconFont-closeLimits::before { content: '\E01A'; } -.CDB-IconFont--defaultUser::before { +.CDB-IconFont-defaultUser::before { content: '\E01B'; } -.CDB-IconFont--cockroach::before { +.CDB-IconFont-cockroach::before { content: '\E01C'; } -.CDB-IconFont--floppy::before { +.CDB-IconFont-floppy::before { content: '\E01D'; } -.CDB-IconFont--trash::before { +.CDB-IconFont-trash::before { content: '\E01E'; } -.CDB-IconFont--wifi::before { +.CDB-IconFont-wifi::before { content: '\E01F'; } -.CDB-IconFont--unlock::before { +.CDB-IconFont-unlock::before { content: '\E020'; } -.CDB-IconFont--unlockwithEllipsis::before { +.CDB-IconFont-unlockWithEllipsis::before { content: '\E021'; } -.CDB-IconFont--gift::before { +.CDB-IconFont-gift::before { content: '\E022'; } -.CDB-IconFont--people::before { +.CDB-IconFont-people::before { content: '\E023'; } -.CDB-IconFont--play::before { +.CDB-IconFont-play::before { content: '\E024'; } -.CDB-IconFont--add::before { +.CDB-IconFont-add::before { content: '\E025'; } -.CDB-IconFont--map::before { +.CDB-IconFont-map::before { content: '\E026'; } -.CDB-IconFont--anchor::before { +.CDB-IconFont-anchor::before { content: '\E027'; } -.CDB-IconFont--key::before { +.CDB-IconFont-key::before { content: '\E028'; } -.CDB-IconFont--calendar::before { +.CDB-IconFont-calendar::before { content: '\E029'; } -.CDB-IconFont--document::before { +.CDB-IconFont-document::before { content: '\E02A'; } -.CDB-IconFont--eye::before { +.CDB-IconFont-eye::before { content: '\E02B'; } -.CDB-IconFont--marker::before { +.CDB-IconFont-marker::before { content: '\E02C'; } -.CDB-IconFont--progressBar::before { +.CDB-IconFont-progressBar::before { content: '\E02D'; } -.CDB-IconFont--book::before { +.CDB-IconFont-book::before { content: '\E02E'; } -.CDB-IconFont--notes::before { +.CDB-IconFont-notes::before { content: '\E02F'; } -.CDB-IconFont--rectangles::before { +.CDB-IconFont-rectangles::before { content: '\E030'; } -.CDB-IconFont--mountain::before { +.CDB-IconFont-mountain::before { content: '\E031'; } -.CDB-IconFont--points::before { +.CDB-IconFont-points::before { content: '\E032'; } -.CDB-IconFont--snake::before { +.CDB-IconFont-snake::before { content: '\E033'; } -.CDB-IconFont--boss::before { +.CDB-IconFont-boss::before { content: '\E034'; } -.CDB-IconFont--rocket::before { +.CDB-IconFont-rocket::before { content: '\E035'; } -.CDB-IconFont--barometer::before { +.CDB-IconFont-barometer::before { content: '\E036'; } -.CDB-IconFont--dollar::before { +.CDB-IconFont-dollar::before { content: '\E037'; } -.CDB-IconFont--email::before { +.CDB-IconFont-email::before { content: '\E038'; } -.CDB-IconFont--label::before { +.CDB-IconFont-label::before { content: '\E039'; } -.CDB-IconFont--outside::before { +.CDB-IconFont-outside::before { content: '\E03A'; } -.CDB-IconFont--jigsaw::before { +.CDB-IconFont-jigsaw::before { content: '\E03B'; } -.CDB-IconFont--tools::before { +.CDB-IconFont-tools::before { content: '\E03C'; } -.CDB-IconFont--question::before { +.CDB-IconFont-question::before { content: '\E03D'; } -.CDB-IconFont--layerStack::before { +.CDB-IconFont-layerStack::before { content: '\E03E'; } -.CDB-IconFont--alarm::before { +.CDB-IconFont-alarm::before { content: '\E03F'; } -.CDB-IconFont--cloudDownArrow::before { +.CDB-IconFont-cloudDownArrow::before { content: '\E040'; } -.CDB-IconFont--pencil::before { +.CDB-IconFont-pencil::before { content: '\E041'; } -.CDB-IconFont--fountainPen::before { +.CDB-IconFont-fountainPen::before { content: '\E042'; } -.CDB-IconFont--emptyDoc::before { +.CDB-IconFont-emptyDoc::before { content: '\E043'; } -.CDB-IconFont--mergeArrow::before { +.CDB-IconFont-mergeArrow::before { content: '\E044'; } -.CDB-IconFont--mergeColumns::before { +.CDB-IconFont-mergeColumns::before { content: '\E045'; } -.CDB-IconFont--mergeSpatial::before { +.CDB-IconFont-mergeSpatial::before { content: '\E046'; } -.CDB-IconFont--globe::before { +.CDB-IconFont-globe::before { content: '\E047'; } -.CDB-IconFont--chevronDown::before { +.CDB-IconFont-chevronDown::before { content: '\E048'; } -.CDB-IconFont--streets::before { +.CDB-IconFont-streets::before { content: '\E049'; } -.CDB-IconFont--keys::before { +.CDB-IconFont-keys::before { content: '\E04A'; } -.CDB-IconFont--facebookSquare::before { +.CDB-IconFont-facebookSquare::before { content: '\E04B'; } -.CDB-IconFont--fullscreen::before { +.CDB-IconFont-fullscreen::before { content: '\E04C'; } -.CDB-IconFont--rarrow::before { +.CDB-IconFont-rarrow::before { content: '\E04D'; } -.CDB-IconFont--share::before { +.CDB-IconFont-share::before { content: '\E04E'; } -.CDB-IconFont--linkedin::before { +.CDB-IconFont-linkedin::before { content: '\E04F'; } -.CDB-IconFont--calendarBlank::before { +.CDB-IconFont-calendarBlank::before { content: '\E050'; } -.CDB-IconFont--creativeCommons::before { +.CDB-IconFont-creativeCommons::before { content: '\E051'; } -.CDB-IconFont--bubble::before { +.CDB-IconFont-bubble::before { content: '\E052'; } -.CDB-IconFont--bars::before { +.CDB-IconFont-bars::before { content: '\E053'; } -.CDB-IconFont--arrowMenu::before { +.CDB-IconFont-arrowMenu::before { content: '\E054'; } -.CDB-IconFont--tieFighter::before { +.CDB-IconFont-tieFighter::before { content: '\E055'; } -.CDB-IconFont--ray::before { +.CDB-IconFont-ray::before { content: '\E056'; } -.CDB-IconFont--markup::before { +.CDB-IconFont-markup::before { content: '\E057'; } -.CDB-IconFont--table::before { +.CDB-IconFont-table::before { content: '\E058'; } -.CDB-IconFont--airlock::before { +.CDB-IconFont-airlock::before { content: '\E059'; } -.CDB-IconFont--pin::before { +.CDB-IconFont-pin::before { content: '\E05A'; } -.CDB-IconFont--attache::before { +.CDB-IconFont-attache::before { content: '\E05B'; } -.CDB-IconFont--download::before { +.CDB-IconFont-download::before { content: '\E05C'; } -.CDB-IconFont--group::before { +.CDB-IconFont-group::before { content: '\E05D'; } -.CDB-IconFont--dashboard::before { +.CDB-IconFont-dashboard::before { content: '\E05E'; } -.CDB-IconFont--spinner::before { +.CDB-IconFont-spinner::before { content: '\E05F'; } -.CDB-IconFont--drop::before { +.CDB-IconFont-drop::before { content: '\E060'; }