From 3a0b30b3763db179ae3a50830d19fbd3e16ca362 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 17:32:03 +0100 Subject: [PATCH 1/5] Changed package author --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 75316b3..36c26c1 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "version": "0.1.16", "homepage": "https://github.com/cartodb/CartoAssets", "author": { - "name": "xavijam", - "email": "xavijam@gmail.com" + "name": "CartoDB", + "email": "contact@cartodb.com" }, "contributors": [ "Javier Álvarez ", From 3cd11b208994e2208ea9670805a2db9d9d0d06d8 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 18:30:37 +0100 Subject: [PATCH 2/5] Moved icon modifiers to icon --- icon-font/template.jst.ejs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index fd1e29f..546a4d5 100644 --- a/icon-font/template.jst.ejs +++ b/icon-font/template.jst.ejs @@ -22,6 +22,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. From c26cd362a28e897399c5879c68c36f0db45bb876 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 18:30:59 +0100 Subject: [PATCH 3/5] New package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36c26c1..4466108 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.16", + "version": "0.1.17", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", From b39ec115dc68fd24bb3cfaeace13c91b55900b08 Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 18:38:59 +0100 Subject: [PATCH 4/5] Upgraded font icon with new modifiers --- icon-font/template.jst.ejs | 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/icon-font.css.scss | 12 ++++++++++++ 5 files changed, 14 insertions(+) diff --git a/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index 546a4d5..d52b624 100644 --- a/icon-font/template.jst.ejs +++ b/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'); diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index c199ab92804436beb5cc5254f1d96a921855d305..167c203df3685414c5bd8445dc55c358268bbc44 100644 GIT binary patch delta 54 zcmbQx%{T#wY?xiU?@zQ}&-8|E;)kiy_q$!=`E9;3a5Mg50D?=$uJ*y`%?lVmI0FDy C78Wc3 delta 54 zcmbQx%{T#wY?vQ@elXE~J(Ky4i65p)KluDGp5Nvx12^L@1|Ya}tU4V=Z(hLo!5ILS Cp%*a# diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index a894c419cb281cb51fcf0411965a48d04aadb75d..4b28d5d8cfc3aa4e955d0d5d707e64f4fcc9a10a 100644 GIT binary patch delta 46 vcmaFT$@rv`ae@=m8@7oqQ>E{ByT7n#ei+Yh^Ob>{@fQOSTsl^r4x=}I`QQuy!hI7; diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index b6857c07278df5a55671648f6f12a5cd0d1af321..4e85c1edaa26bc74dfc4304ab61e9d20bc5502a2 100644 GIT binary patch delta 60 zcmV-C0K@;BSDaUndIIbQv3yD-DSP!#@eh#8 S!N3F(1pu}I5D&BOB&`Nar5cI= delta 60 zcmV-C0K@;BSDaUndIC4Nv3yD-Df=%PQRB&`Nf{Tq$| diff --git a/src/scss/icon-font.css.scss b/src/scss/icon-font.css.scss index ddeeef6..14b5258 100644 --- a/src/scss/icon-font.css.scss +++ b/src/scss/icon-font.css.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. From 7944b4aaa640d95891847d4e5ddfaa9591b7571c Mon Sep 17 00:00:00 2001 From: xavijam Date: Thu, 21 Jan 2016 18:39:22 +0100 Subject: [PATCH 5/5] New package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4466108..4423b57 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.17", + "version": "0.1.18", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB",