diff --git a/icon-font/template.jst.ejs b/icon-font/template.jst.ejs index 9b2eadc..3552596 100644 --- a/icon-font/template.jst.ejs +++ b/icon-font/template.jst.ejs @@ -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 diff --git a/package.json b/package.json index 984518b..026b87e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cartoassets", "description": "Share frontend assets between different CartoDB repositories", - "version": "0.1.21", + "version": "0.1.23", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB", diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 2c7eb83..d9aff25 100644 Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 323c7e1..f61778a 100644 Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 05a4401..f8f872e 100644 Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ diff --git a/src/scss/cdb-icon-font.scss b/src/scss/cdb-icon-font.scss index 9a33def..9b56a11 100644 --- a/src/scss/cdb-icon-font.scss +++ b/src/scss/cdb-icon-font.scss @@ -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 diff --git a/src/scss/cdb-utilities/defaults.css.scss b/src/scss/cdb-utilities/defaults.css.scss new file mode 100644 index 0000000..c7998f1 --- /dev/null +++ b/src/scss/cdb-utilities/defaults.css.scss @@ -0,0 +1,14 @@ +// Default classes +// ---------------------------------------------- + +@import '../cdb-variables/colors'; + +a { + color: $cBlue; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + diff --git a/src/scss/cdb-utilities/normalize.scss b/src/scss/cdb-utilities/vendor/normalize.scss similarity index 100% rename from src/scss/cdb-utilities/normalize.scss rename to src/scss/cdb-utilities/vendor/normalize.scss diff --git a/src/scss/utilities/reset.scss b/src/scss/cdb-utilities/vendor/reset.scss similarity index 90% rename from src/scss/utilities/reset.scss rename to src/scss/cdb-utilities/vendor/reset.scss index 1c48e86..51ee936 100644 --- a/src/scss/utilities/reset.scss +++ b/src/scss/cdb-utilities/vendor/reset.scss @@ -3,8 +3,6 @@ License: none (public domain) */ -@import '../cdb-variables/colors'; - html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -60,12 +58,3 @@ button { dd, dt { display: inline-block; } - -a { - text-decoration: none; - color: $cBlue; -} - -a:hover { - text-decoration: underline; -}