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

Merge branch 'master' of github.com:CartoDB/CartoAssets into 27-add-default

Browse Source
This commit is contained in:
piensaenpixel 2016-01-29 17:48:39 +01:00
commit a07ece2e34
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
// Icon font elements // Icon font elements
// ---------------------------------------------- // ----------------------------------------------
@import "cdb-variables/sizes"; // Do not import any file (variables, mixins,...) in this stylesheet.
@font-face { @font-face {
font-family: 'CartoIcon'; font-family: 'CartoIcon';
@ -31,7 +31,7 @@
vertical-align: top; vertical-align: top;
} }
.CDB-IconFont--small { .CDB-IconFont--small {
font-size: $sFontSize-small + 1; font-size: 11px;
} }
/* SG /* SG

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cartoassets", "name": "cartoassets",
"description": "Share frontend assets between different CartoDB repositories", "description": "Share frontend assets between different CartoDB repositories",
"version": "0.1.21", "version": "0.1.22",
"homepage": "https://github.com/cartodb/CartoAssets", "homepage": "https://github.com/cartodb/CartoAssets",
"author": { "author": {
"name": "CartoDB", "name": "CartoDB",

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

@ -1,7 +1,7 @@
// Icon font elements // Icon font elements
// ---------------------------------------------- // ----------------------------------------------
@import "cdb-variables/sizes"; // Do not import any file (variables, mixins,...) in this stylesheet.
@font-face { @font-face {
font-family: 'CartoIcon'; font-family: 'CartoIcon';
@ -31,7 +31,7 @@
vertical-align: top; vertical-align: top;
} }
.CDB-IconFont--small { .CDB-IconFont--small {
font-size: $sFontSize-small + 1; font-size: 11px;
} }
/* SG /* SG