cartodb4/CartoAssets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes conflicts

Browse Source
This commit is contained in:
Javier Arce 2016-01-22 11:58:46 +01:00
commit 1a8e5ff3bd
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icon-font/template.jst.ejs
View File

@ -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.

6
package.json
View File

@ -1,11 +1,11 @@
{
"name": "cartoassets",
"description": "Share frontend assets between different CartoDB repositories",
"version": "0.1.17",
"version": "0.1.19",
"homepage": "https://github.com/cartodb/CartoAssets",
"author": {
"name": "xavijam",
"email": "xavijam@gmail.com"
"name": "CartoDB",
"email": "contact@cartodb.com"
},
"contributors": [
"Javier Álvarez <jmedina@cartodb.com>",

BIN
src/fonts/cartoIcon.eot
View File

Binary file not shown.

BIN
src/fonts/cartoIcon.ttf
View File

Binary file not shown.

BIN
src/fonts/cartoIcon.woff
View File

Binary file not shown.

12
src/scss/cdb-icon-font.scss
View File

@ -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.