Fixes css import. Bump frontend

pull/6477/head
Javier Arce 9 years ago
parent 273701a1b6
commit 48f50754e8

@ -169,7 +169,7 @@
grunt.registerTask('pre_default', ['clean', 'config', 'js']);
grunt.registerTask('test', '(CI env) Re-build JS files and run all tests. ' +
'For manual testing use `grunt jasmine` directly', ['pre_default', 'jasmine']);
grunt.registerTask('css', ['copy:vendor', 'copy:cartofonts', 'copy:cartoassets', 'copy:app', 'compass', 'concat:css']);
grunt.registerTask('css', ['copy:vendor', 'copy:cartofonts', 'copy:iconfont', 'copy:cartoassets', 'copy:app', 'compass', 'concat:css']);
grunt.registerTask('default', ['pre_default', 'css', 'manifest']);
grunt.registerTask('minimize', ['default', 'copy:js', 'exorcise', 'uglify']);
grunt.registerTask('release', ['check_release', 'minimize', 's3', 'invalidate']);

@ -13,7 +13,7 @@ module.exports = [
short_name: 'Create animated maps',
description: 'Learn how to animate your data, by using historic United States tornado data.',
short_description: 'Create maps for showing events over time',
icon: 'Snake',
icon: 'snake',
color: '#CB3F29',
difficulty: 'easy',
duration: '5:01',
@ -30,7 +30,7 @@ module.exports = [
short_name: 'Create GPS Data maps',
description: 'Let\'s take a look at one week of movements for a cat named Spencer. Using GPS collected data, we can animate Spencer over time to see his patterns of exploration in his neighborhood.',
short_description: 'Mapping your GPS data was never so easy!',
icon: 'Points',
icon: 'points',
color: '#AC638B',
difficulty: 'easy',
duration: '1:53',
@ -47,7 +47,7 @@ module.exports = [
short_name: 'Create your own datasets',
description: 'Learn to create your own point, line, or polygon dataset directly in the CartoDB editor.',
short_description: ' Add and style features in a map using the CartoDB UI',
icon: 'Notes',
icon: 'notes',
color: '#F2C000',
difficulty: 'easy',
duration: '5:39',
@ -61,7 +61,7 @@ module.exports = [
short_name: 'Map your local world',
description: "We will use a publically available set of buildings to map Nantucket Island. Then we will use CartoDB's annotation tools to highlight our point of interest.",
short_description: 'Learn to create and style a map of your city',
icon: 'Mountain',
icon: 'mountain',
color: '#EA703D',
difficulty: 'easy',
duration: '2:57',
@ -78,7 +78,7 @@ module.exports = [
short_name: 'Join Datasets',
description: 'Create your first choropleth map by joining historic tornado data with United States polygons',
short_description: 'Build your first choropleth map by joining two datasets',
icon: 'Rectangles',
icon: 'rectangles',
color: '#86B765',
difficulty: 'medium',
duration: '5:17',
@ -96,7 +96,7 @@ module.exports = [
short_name: 'Map MailChimp Campaigns',
description: 'Create a map of where your subscribers are and which of them have opened any of your campaigns. Also this is a great way to learn about conditional styling.',
short_description: 'Map your engagement using the MailChimp Connector.',
icon: 'Email',
icon: 'email',
color: '#AC638B',
difficulty: 'easy',
duration: '1:49',

@ -25,7 +25,6 @@ module.exports = css_files = {
common: [
'<%= assets_dir %>/stylesheets/old_common/video_player.css',
'<%= assets_dir %>/stylesheets/common/utilities.css',
'<%= assets_dir %>/stylesheets/common/icon-font-import.css',
'<%= assets_dir %>/stylesheets/common/icon-font-specials.css',
'<%= assets_dir %>/stylesheets/common/**/*.css'
],
@ -130,7 +129,6 @@ module.exports = css_files = {
sessions: [
'<%= assets_dir %>/stylesheets/common/flash-message.css',
'<%= assets_dir %>/stylesheets/common/tooltip.css',
'<%= assets_dir %>/stylesheets/common/icon-font-import.css',
'<%= assets_dir %>/stylesheets/common/logo.css',
'<%= assets_dir %>/stylesheets/fonts/proximanova-font-face.css',
'<%= assets_dir %>/stylesheets/sessions/*.css'

@ -31,7 +31,14 @@
expand: true,
cwd: 'node_modules/cartoassets/src/scss/',
src: '**/*.scss',
dest: 'tmp/sass/'
dest: 'tmp/sass/cartoassets/'
},
iconfont: {
expand: true,
cwd: 'node_modules/cartoassets/src/scss/',
src: 'cdb-icon-font.scss',
dest: 'tmp/sass/common/'
},
cartofonts: {

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "3.23.25",
"version": "3.23.26",
"description": "CartoDB UI frontend",
"repository": {
"type": "git",

Loading…
Cancel
Save