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

Merge branch 'master' into 29-browsers_review

Browse Source
This commit is contained in:
María Checa 2016-02-01 11:53:24 +01:00
commit f040bbf31e
9 changed files with 19 additions and 16 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.23",
"homepage": "https://github.com/cartodb/CartoAssets", "homepage": "https://github.com/cartodb/CartoAssets",
"author": { "author": {
"name": "CartoDB", "name": "CartoDB",

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.

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

14
src/scss/cdb-utilities/defaults.css.scss Normal file
View File

@ -0,0 +1,14 @@
// Default classes
// ----------------------------------------------
@import '../cdb-variables/colors';
a {
color: $cBlue;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}

0
src/scss/cdb-utilities/normalize.scss → src/scss/cdb-utilities/vendor/normalize.scss vendored
View File

11
src/scss/utilities/reset.scss → src/scss/cdb-utilities/vendor/reset.scss vendored
View File

@ -3,8 +3,6 @@
License: none (public domain) License: none (public domain)
*/ */
@import '../cdb-variables/colors';
html, body, div, span, applet, object, iframe, html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, a, abbr, acronym, address, big, cite, code,
@ -60,12 +58,3 @@ button {
dd, dt { dd, dt {
display: inline-block; display: inline-block;
} }
a {
text-decoration: none;
color: $cBlue;
}
a:hover {
text-decoration: underline;
}