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
parent 890e3b76a8 7944b4aaa6
commit 1a8e5ff3bd
6 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
icon-font/template.jst.ejs
+12
View File
@@ -1,6 +1,8 @@
// Icon font elements // Icon font elements
// ---------------------------------------------- // ----------------------------------------------
@import "cdb-variables/sizes";
@font-face { @font-face {
font-family: 'CartoIcon'; font-family: 'CartoIcon';
src: url('../fonts/cartoIcon.eot'); src: url('../fonts/cartoIcon.eot');
@@ -22,6 +24,16 @@
line-height: 1; line-height: 1;
} }
.CDB-IconFont--center {
vertical-align: middle;
}
.CDB-IconFont--top {
vertical-align: top;
}
.CDB-IconFont--small {
font-size: $sFontSize-small + 1;
}
/* SG /* SG
# Typography/Icon font # Typography/Icon font
All available icons in CartoDB. All available icons in CartoDB.
package.json
+3 -3
View File
@@ -1,11 +1,11 @@
{ {
"name": "cartoassets", "name": "cartoassets",
"description": "Share frontend assets between different CartoDB repositories", "description": "Share frontend assets between different CartoDB repositories",
"version": "0.1.17", "version": "0.1.19",
"homepage": "https://github.com/cartodb/CartoAssets", "homepage": "https://github.com/cartodb/CartoAssets",
"author": { "author": {
"name": "xavijam", "name": "CartoDB",
"email": "xavijam@gmail.com" "email": "contact@cartodb.com"
}, },
"contributors": [ "contributors": [
"Javier Álvarez <jmedina@cartodb.com>", "Javier Álvarez <jmedina@cartodb.com>",
src/fonts/cartoIcon.eot
BIN
View File
Binary file not shown.
src/fonts/cartoIcon.ttf
BIN
View File
Binary file not shown.
src/fonts/cartoIcon.woff
BIN
View File
Binary file not shown.
src/scss/cdb-icon-font.scss
+12
View File
@@ -1,6 +1,8 @@
// Icon font elements // Icon font elements
// ---------------------------------------------- // ----------------------------------------------
@import "cdb-variables/sizes";
@font-face { @font-face {
font-family: 'CartoIcon'; font-family: 'CartoIcon';
src: url('../fonts/cartoIcon.eot'); src: url('../fonts/cartoIcon.eot');
@@ -22,6 +24,16 @@
line-height: 1; line-height: 1;
} }
.CDB-IconFont--center {
vertical-align: middle;
}
.CDB-IconFont--top {
vertical-align: top;
}
.CDB-IconFont--small {
font-size: $sFontSize-small + 1;
}
/* SG /* SG
# Typography/Icon font # Typography/Icon font
All available icons in CartoDB. All available icons in CartoDB.