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

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

View File

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

View File

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

View File

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