From 14d23e9b35652706f395eaecc3691482c385382f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20=C3=81lvarez=20Medina?= <xavijam@gmail.com>
Date: Wed, 24 May 2017 13:17:36 +0200
Subject: [PATCH] Adding perfect-scroll styles to cartoassets

---
 package.json             |   3 ++-
 src/fonts/cartoIcon.eot  | Bin 20864 -> 20864 bytes
 src/fonts/cartoIcon.ttf  | Bin 20692 -> 20692 bytes
 src/fonts/cartoIcon.woff | Bin 13020 -> 13020 bytes
 src/scss/entry.scss      |   2 ++
 tasks/sass.js            |   5 ++++-
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a6c7113..cfcfd7a 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,8 @@
     "gulp-install": "0.2.0",
     "gulp-sketch": "0.0.7",
     "grunt-shell": "1.1.2",
-    "load-grunt-tasks": "*"
+    "load-grunt-tasks": "*",
+    "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master"
   },
   "keywords": [
     "library",
diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index a11e456ac04524a4769e70025222d108c9e65430..1f632a9c08c2c153f29c44a89bc201a1d75f4ed0 100644
GIT binary patch
delta 52
zcmZoz%-FD)ae@ug&cKOw8<?i1O#CoSDsX2!zs*+$ZpL2>KycMt%N9m&UcmUk9{~IX
B5)1$U

delta 52
zcmZoz%-FD)ae@t#ZT3XF4NM)2CVrSEm2Df(Z}XLboADO|5M1?Ez5}B-FJOG&4*>GK
B5~%<H

diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index ac15ce523006a893515c99d17667e843a4d46025..8b50061c8bf3adb25d09d3284e6572b153f96d33 100644
GIT binary patch
delta 45
ucmcbzknzew#tBYLQ&T3oOp^-S8P9L?m4Tb_7XuJn_13b5(Hp-!@CN{TQxDJp

delta 45
ucmcbzknzew#tBYL9g8NqOq0sCjpw)d%D~O|ivb9(dMn?7(Hp-!@CN{Zn-I?c

diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index 26924bc8027f3f4c6a0e77746d241da3ccee61e4..edff724efe8f48bf2e72b412fc0bcf518e1c5e25 100644
GIT binary patch
delta 66
zcmV-I0KNa*W!z<ua|tp4001@sgq38meA6l@B8Bn%HeVUI8Givq7_NG2*}~{I<^R8P
YMKJyWayb~7K%xLY_6!aHvv(_H2b5zP+5i9m

delta 66
zcmV-I0KNa*W!z<ua|ts5001@sgovWCeA6l@x?kh@ZN4&aGyVdKFkJOkz5}D*l>h(E
Y6~Xui$mL*Q0*L|ub+8TFvv(_H2lO8vjsO4v

diff --git a/src/scss/entry.scss b/src/scss/entry.scss
index cae3365..4d60242 100644
--- a/src/scss/entry.scss
+++ b/src/scss/entry.scss
@@ -12,6 +12,8 @@
 @import 'cdb-utilities/fonts';
 @import 'cdb-utilities/helpers';
 
+@import 'main'; // Perfect scrollbar styles
+
 @import 'cdb-components/forms/checkbox';
 @import 'cdb-components/forms/dropdowns';
 @import 'cdb-components/forms/inputs';
diff --git a/tasks/sass.js b/tasks/sass.js
index 8f8f168..0c24c19 100644
--- a/tasks/sass.js
+++ b/tasks/sass.js
@@ -2,7 +2,10 @@ module.exports = {
   dist: {
     options: {
       sourceMap: false,
-      outputStyle: 'compressed'
+      outputStyle: 'compressed',
+      includePaths: [
+        'node_modules/perfect-scrollbar/src/css'
+      ]
     },
     files: [{
       expand: true,