Adding perfect-scroll styles to cartoassets

2017-05-24 13:17:36 +02:00 · 2017-05-24 13:17:36 +02:00 · 14d23e9b35
commit 14d23e9b35
parent 3012203185
6 changed files with 8 additions and 2 deletions
--- 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",
--- a/src/fonts/cartoIcon.eot
+++ b/src/fonts/cartoIcon.eot
--- a/src/fonts/cartoIcon.ttf
+++ b/src/fonts/cartoIcon.ttf
--- a/src/fonts/cartoIcon.woff
+++ b/src/fonts/cartoIcon.woff
--- 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';
--- 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,