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 a11e456..1f632a9 100644 Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index ac15ce5..8b50061 100644 Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index 26924bc..edff724 100644 Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ 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,