From fae542835426096e7f25cedca099439db130a4b8 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Wed, 27 Jan 2016 16:00:57 +0100 Subject: [PATCH 1/4] create default stylesheet #27 --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-utilities/default.scss | 14 ++++++++++++++ src/scss/utilities/reset.scss | 9 --------- 5 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 src/scss/cdb-utilities/default.scss diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 2c7eb83aa37161bf0e107e884cf4430e3bfce937..d9aff25db436abd65a4564b57cf68ec2a86c9fc6 100644 GIT binary patch delta 52 zcmZ26nQ_Hr#tAk|?Mo-xZD1-%nfPIv)YA5New(ih+>E~%fZ)=(nR{XM<^_x#9snq2 B6kY%T delta 52 zcmZ26nQ_Hr#tAk|+@B}fZD8_UH1WeUsn6W;{5D@1xEX&j0KuhmZ80!<^8!W=4*(S> B6EOe) diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 323c7e1e2413a1d96777bd9cc3449e7df461e546..f61778a2a48bf4cc6baa0b97b9c434d2d5d69e3f 100644 GIT binary patch delta 45 ucmew}k@3$&#tBYLB`FhKrb#VrkLS1f%D~O|ivb8OotwEAMsNJW;Q;`h6cPXc delta 45 ucmew}k@3$&#tBYLzKbThOq2S|9nWv`m4Tb_7XuJnI@cBhqc?ux@Bjdk+z|l) diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 05a4401d08f5b55324963f3d61dceff9641efe81..f8f872e7914b30d6824210f790094499f77353bc 100644 GIT binary patch delta 59 zcmV-B0L1^iT)bS6dIEH0v3$2CC>@XE`E9;3a5Me_iZEO{H*+tHepCMcJ68nbA0U^5 Rfe9oE0KKjdHM3hM;RY147^naM delta 59 zcmV-B0L1^iT)bS6dIC+Nv3$2CDA&^C`E9;3a5Me_iZEO{*A@e#-<1FV&K1G<2gv1M RU;>E(0HH(=AG2F0;RbxK90LFV diff --git a/src/scss/cdb-utilities/default.scss b/src/scss/cdb-utilities/default.scss new file mode 100644 index 0000000..c7998f1 --- /dev/null +++ b/src/scss/cdb-utilities/default.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/utilities/reset.scss b/src/scss/utilities/reset.scss index 7115f42..3e53b72 100644 --- a/src/scss/utilities/reset.scss +++ b/src/scss/utilities/reset.scss @@ -60,12 +60,3 @@ button { dd, dt { display: inline-block; } - -a { - text-decoration: none; - color: $cBlue; -} - -a:hover { - text-decoration: underline; -} From d1279336cdea2370db72c5ddc91b1aa2c9f3d25d Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 29 Jan 2016 16:49:34 +0100 Subject: [PATCH 2/4] fix pr --- src/scss/cdb-utilities/{default.scss => defaults.css.scss} | 0 src/scss/cdb-utilities/{ => vendor}/normalize.scss | 0 src/scss/{utilities => cdb-utilities/vendor}/reset.scss | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/scss/cdb-utilities/{default.scss => defaults.css.scss} (100%) rename src/scss/cdb-utilities/{ => vendor}/normalize.scss (100%) rename src/scss/{utilities => cdb-utilities/vendor}/reset.scss (100%) diff --git a/src/scss/cdb-utilities/default.scss b/src/scss/cdb-utilities/defaults.css.scss similarity index 100% rename from src/scss/cdb-utilities/default.scss rename to src/scss/cdb-utilities/defaults.css.scss 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 100% rename from src/scss/utilities/reset.scss rename to src/scss/cdb-utilities/vendor/reset.scss From 3777708330240321658782f7b2df613eef76c662 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 29 Jan 2016 17:01:44 +0100 Subject: [PATCH 3/4] remove unnecessary css --- src/scss/cdb-utilities/vendor/reset.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/scss/cdb-utilities/vendor/reset.scss b/src/scss/cdb-utilities/vendor/reset.scss index 3e53b72..0c9b86d 100644 --- a/src/scss/cdb-utilities/vendor/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, From 0faf002dffecf47a3e9b94b7568104fe90f27080 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Fri, 29 Jan 2016 17:51:12 +0100 Subject: [PATCH 4/4] bump package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e64a1e1..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.22", + "version": "0.1.23", "homepage": "https://github.com/cartodb/CartoAssets", "author": { "name": "CartoDB",