Merge branch 'master' into 29-browsers_review

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

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",

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

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;
+}
+

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;
-}