Don't take perfect-scrollbar from its dependency, cartoassets will do it

pull/12065/head
Javier Álvarez Medina 7 years ago
parent afefda16e2
commit f49dfe2edf

@ -26,7 +26,7 @@ module.exports = css_files = {
'<%= assets_dir %>/stylesheets/common/utilities.css',
'<%= assets_dir %>/stylesheets/common/icon-font-specials.css',
'<%= assets_dir %>/stylesheets/common/**/*.css',
'<%= assets_dir %>/stylesheets/cartoassets/**/*.css',
'<%= assets_dir %>/stylesheets/cartoassets/entry.css',
'<%= assets_dir %>/stylesheets/client/**/*.css'
],
@ -183,7 +183,7 @@ module.exports = css_files = {
'<%= assets_dir %>/stylesheets/common/forms/**/*.css',
'<%= assets_dir %>/stylesheets/common/option-card.css',
'<%= assets_dir %>/stylesheets/common/icons/**/*.css',
'<%= assets_dir %>/stylesheets/cartoassets/**/*.css',
'<%= assets_dir %>/stylesheets/cartoassets/entry.css',
'<%= assets_dir %>/stylesheets/colorpicker/bootstrap-colorpicker/*.css',
'<%= assets_dir %>/stylesheets/editor-3/**/*.css',
'<%= assets_dir %>/stylesheets/common/maps-list.css',
@ -210,7 +210,6 @@ module.exports = css_files = {
deep_insights: [
'<%= assets_dir %>/stylesheets/deep-insights/entry.css',
'<%= assets_dir %>/stylesheets/deep-insights/main.css',
'<%= assets_dir %>/stylesheets/cartodbjs_v4/entry.css'
],

@ -34,11 +34,6 @@ exports.task = function (grunt) {
cwd: 'node_modules/cartoassets/src/scss/',
src: '**/*.scss',
dest: 'tmp/sass/cartoassets/'
}, {
expand: true,
cwd: 'node_modules/perfect-scrollbar/src/css/',
src: '*.scss',
dest: 'tmp/sass/deep-insights/'
}, {
expand: true,
cwd: 'node_modules/bootstrap-colorpicker/dist/css/',

@ -5,11 +5,11 @@
exports.task = function () {
return {
options: {
sourceMap: true,
sourceMapEmbed: true,
sourceMapContents: true,
sourceMap: false,
sourceMapEmbed: false,
sourceMapContents: false,
includePaths: [
'tmp/sass/cartoassets/'
'node_modules/cartoassets/src/scss'
]
},
dist: {
@ -18,13 +18,7 @@ exports.task = function () {
cwd: 'tmp/sass/',
src: [
'**/*.scss',
'!editor/**/*',
// TODO: this can be achieved prepending the asstes with _
'!deep-insights/**/*',
'deep-insights/main.scss',
'deep-insights/entry.scss',
'!cartodbjs_v4/**/*',
'cartodbjs_v4/entry.scss'
'!editor/**/*'
],
dest: '<%= assets_dir %>/stylesheets',
ext: '.css'

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.7.08",
"version": "4.7.10",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
@ -24,9 +24,9 @@
"camshaft-reference": "0.32.0",
"carto": "cartodb/carto#master",
"cartocolor": "4.0.0",
"cartodb-deep-insights.js": "cartodb/deep-insights.js#master",
"cartodb-deep-insights.js": "cartodb/deep-insights.js#scss-task",
"cartodb-pecan": "0.2.x",
"cartodb.js": "CartoDB/cartodb.js#v4",
"cartodb.js": "CartoDB/cartodb.js#scss-task",
"clipboard": "1.6.1",
"codemirror": "5.14.2",
"jquery": "2.1.4",
@ -45,7 +45,7 @@
"bluebird": "3.5.0",
"brfs": "^1.4.3",
"browserify-resolutions": "1.1.0",
"cartoassets": "cartodb/CartoAssets#master",
"cartoassets": "CartoDB/CartoAssets#entry-point",
"colors": "1.1.2",
"csswring": "^3.0.5",
"exports-loader": "0.6.4",
@ -69,7 +69,7 @@
"grunt-contrib-watch": "1.0.0",
"grunt-exorcise": "2.1.0",
"grunt-postcss": "0.5.5",
"grunt-sass": "^2.0.0",
"grunt-sass": "2.0.0",
"grunt-timer": "0.3.3",
"jasmine": "2.5.2",
"jasmine-ajax": "git://github.com/nobuti/jasmine-ajax.git#master",

Loading…
Cancel
Save