From bc8e8f6669ebb1a35008fdb8913729a8c4fad452 Mon Sep 17 00:00:00 2001
From: Javier Arce <javierarce@gmail.com>
Date: Thu, 21 Jan 2016 12:11:39 +0100
Subject: [PATCH 1/2] Adds namespace

---
 src/fonts/cartoIcon.eot                       | Bin 17808 -> 17808 bytes
 src/fonts/cartoIcon.ttf                       | Bin 17636 -> 17636 bytes
 src/fonts/cartoIcon.woff                      | Bin 11164 -> 11164 bytes
 .../colors.scss                               |   2 +-
 .../loader.scss                               |   2 +-
 .../shapes.scss                               |   2 +-
 .../typography.scss                           |   2 +-
 .../{utilities => cdb-utilities}/_mixins.scss |   0
 .../{utilities => cdb-utilities}/fonts.scss   |   0
 .../{utilities => cdb-utilities}/helpers.scss |   0
 .../normalize.scss                            |   0
 .../{variables => cdb-variables}/_colors.scss |   0
 .../{variables => cdb-variables}/_sizes.scss  |   0
 13 files changed, 4 insertions(+), 4 deletions(-)
 rename src/scss/{components => cdb-components}/colors.scss (98%)
 rename src/scss/{components => cdb-components}/loader.scss (95%)
 rename src/scss/{components => cdb-components}/shapes.scss (99%)
 rename src/scss/{components => cdb-components}/typography.scss (96%)
 rename src/scss/{utilities => cdb-utilities}/_mixins.scss (100%)
 rename src/scss/{utilities => cdb-utilities}/fonts.scss (100%)
 rename src/scss/{utilities => cdb-utilities}/helpers.scss (100%)
 rename src/scss/{utilities => cdb-utilities}/normalize.scss (100%)
 rename src/scss/{variables => cdb-variables}/_colors.scss (100%)
 rename src/scss/{variables => cdb-variables}/_sizes.scss (100%)

diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index 3e1ec5a3e518a2207c117bc9187e16504e46569e..c199ab92804436beb5cc5254f1d96a921855d305 100644
GIT binary patch
delta 55
zcmbQx%{T#wY?vQ@elXE~9dot$j)@<pN<aAgFrMG$D+4#<F9smEbgViZMsHrg_`w+f
Du$mXF

delta 55
zcmbQx%{T#wY?u|VKAC90j=9oZV&aFX(oe1`#`D{JW#DG~#Q+4Cjy8+K=*<flKR5#b
DRV)<L

diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index 3c43b13535528218f5ce554ffd9c3747e4604c9b..a894c419cb281cb51fcf0411965a48d04aadb75d 100644
GIT binary patch
delta 47
wcmaFT$@rv`ae^arwfT;TE>oo+e0~_uZ}XLboADO|5L`M|oerZne)-@G0N8I6#Q*>R

delta 47
wcmaFT$@rv`ae^arrMtvLm#NZEt}4d!+k9o<X8gqf1ecCBi^J%RUp_bk0HzfY#{d8T

diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index 96e544f2db9a861ae866cd8772799eefde6e1929..b6857c07278df5a55671648f6f12a5cd0d1af321 100644
GIT binary patch
delta 61
zcmV-D0K)&ASDaUnc>{YlxUqanBq{qZ8sqtGzA|t#{sM|HTsl^r4x`_c|NqVv!T1Nr
T<zQd}i2?whj1LpD?<B1TZs8mW

delta 61
zcmV-D0K)&ASDaUnc>{Sz7_odxBq_%y561J`d}ZKf`~?(YxOB8x97ew>|NosUg7FWK
T%fY||5(NO5nhvJ3?<B1TSqmH9

diff --git a/src/scss/components/colors.scss b/src/scss/cdb-components/colors.scss
similarity index 98%
rename from src/scss/components/colors.scss
rename to src/scss/cdb-components/colors.scss
index 53cdbda..1fac96d 100644
--- a/src/scss/components/colors.scss
+++ b/src/scss/cdb-components/colors.scss
@@ -15,7 +15,7 @@
 ``` 
 */
 
-@import '../variables/colors';
+@import '../cdb-variables/colors';
 
 .box {
   width: 120px;
diff --git a/src/scss/components/loader.scss b/src/scss/cdb-components/loader.scss
similarity index 95%
rename from src/scss/components/loader.scss
rename to src/scss/cdb-components/loader.scss
index 7f0aeba..e812aff 100644
--- a/src/scss/components/loader.scss
+++ b/src/scss/cdb-components/loader.scss
@@ -12,7 +12,7 @@ There is only one state 'is-visible', in order to make it visible.
 ```
 */
 
-@import '../utilities/mixins';
+@import '../cdb-utilities/mixins';
 
 .CDB-Loader {
   @include css3-prefix(animation, loader-progress 1000ms linear 1);
diff --git a/src/scss/components/shapes.scss b/src/scss/cdb-components/shapes.scss
similarity index 99%
rename from src/scss/components/shapes.scss
rename to src/scss/cdb-components/shapes.scss
index dd89e0d..2e3fc51 100644
--- a/src/scss/components/shapes.scss
+++ b/src/scss/cdb-components/shapes.scss
@@ -12,7 +12,7 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava
 ```
 */
 
-@import '../utilities/mixins';
+@import '../cdb-utilities/mixins';
 
 .CDB-Shape-dot {
   display: inline-block;
diff --git a/src/scss/components/typography.scss b/src/scss/cdb-components/typography.scss
similarity index 96%
rename from src/scss/components/typography.scss
rename to src/scss/cdb-components/typography.scss
index c44facf..3d65171 100644
--- a/src/scss/components/typography.scss
+++ b/src/scss/cdb-components/typography.scss
@@ -14,7 +14,7 @@
 ```
 */
 
-@import '../variables/sizes';
+@import '../cdb-variables/sizes';
 
 .Text {
   font-family: 'Open Sans';
diff --git a/src/scss/utilities/_mixins.scss b/src/scss/cdb-utilities/_mixins.scss
similarity index 100%
rename from src/scss/utilities/_mixins.scss
rename to src/scss/cdb-utilities/_mixins.scss
diff --git a/src/scss/utilities/fonts.scss b/src/scss/cdb-utilities/fonts.scss
similarity index 100%
rename from src/scss/utilities/fonts.scss
rename to src/scss/cdb-utilities/fonts.scss
diff --git a/src/scss/utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss
similarity index 100%
rename from src/scss/utilities/helpers.scss
rename to src/scss/cdb-utilities/helpers.scss
diff --git a/src/scss/utilities/normalize.scss b/src/scss/cdb-utilities/normalize.scss
similarity index 100%
rename from src/scss/utilities/normalize.scss
rename to src/scss/cdb-utilities/normalize.scss
diff --git a/src/scss/variables/_colors.scss b/src/scss/cdb-variables/_colors.scss
similarity index 100%
rename from src/scss/variables/_colors.scss
rename to src/scss/cdb-variables/_colors.scss
diff --git a/src/scss/variables/_sizes.scss b/src/scss/cdb-variables/_sizes.scss
similarity index 100%
rename from src/scss/variables/_sizes.scss
rename to src/scss/cdb-variables/_sizes.scss

From eb10ff44ea48546ec68f2211308a9cc96986568e Mon Sep 17 00:00:00 2001
From: Javier Arce <javierarce@gmail.com>
Date: Thu, 21 Jan 2016 12:11:48 +0100
Subject: [PATCH 2/2] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f5033a1..607ec45 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cartoassets",
   "description": "Share frontend assets between different CartoDB repositories",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "homepage": "https://github.com/cartodb/CartoAssets",
   "author": {
     "name": "xavijam",