merge master

This commit is contained in:
piensaenpixel 2016-02-01 11:13:40 +01:00
commit 09aa476479
7 changed files with 15 additions and 12 deletions

View File

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

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

View File

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