zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1198 from CartoDB/1084-color-ramps

Browse Source 
Adds new color ramps
pull/1205/head
Javier Arce 10 years ago
parent 80fba6a61c 8408c59b17
commit f6c34ed6f9
2 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File

51
lib/assets/javascripts/cartodb/models/color_ramps.js
Unescape View File

@ -93,9 +93,58 @@ cdb.admin.color_ramps = {
'5': ['#0080ff', '#40a0ff', '#fff2cc', '#ff7a7a', '#ff4d4d'],
'6': ['#0080ff', '#40a0ff', '#7fbfff', '#ffa6a6', '#ff7a7a', '#ff4d4d'],
'7': ['#0080ff', '#40a0ff', '#7fbfff', '#fff2cc', '#ffa6a6', '#ff7a7a', '#ff4d4d']
},
red_states: {
'3': ['#8A4E8A', '#B379B3', '#F1E6F1'],
'4': ['#8A4E8A', '#A05AA0', '#D8BBD8', '#F1E6F1'],
'5': ['#8A4E8A', '#A05AA0', '#B379B3', '#D8BBD8', '#F1E6F1'],
'6': ['#8A4E8A', '#A05AA0', '#B379B3', '#CCA5CC', '#D8BBD8', '#F1E6F1'],
'7': ['#8A4E8A', '#A05AA0', '#B379B3', '#C08FC0', '#CCA5CC', '#D8BBD8', '#F1E6F1']
},
purple_states: {
'3': ['#C1373C', '#D4686C', '#F2D2D3'],
'4': ['#C1373C', '#CC4E52', '#EBB7B9', '#F2D2D3'],
'5': ['#C1373C', '#CC4E52', '#D4686C', '#EBB7B9', '#F2D2D3'],
'6': ['#C1373C', '#CC4E52', '#D4686C', '#E39D9F', '#EBB7B9', '#F2D2D3'],
'7': ['#C1373C', '#CC4E52', '#D4686C', '#DB8286', '#E39D9F', '#EBB7B9', '#F2D2D3']
},
blue_states: {
'3': ['#43618F', '#6182B5', '#ECF0F6'],
'4': ['#43618F', '#4E71A6', '#B2C2DB', '#ECF0F6'],
'5': ['#43618F', '#4E71A6', '#6182B5', '#B2C2DB', '#ECF0F6'],
'6': ['#43618F', '#4E71A6', '#6182B5', '#9BB0D0', '#B2C2DB', '#ECF0F6'],
'7': ['#43618F', '#4E71A6', '#6182B5', '#849EC5', '#9BB0D0', '#B2C2DB', '#ECF0F6']
},
inverted_red_states: {
'3': ["#F1E6F1", "#B379B3", "#8A4E8A"],
'4': ["#F1E6F1", "#D8BBD8", "#A05AA0", "#8A4E8A"],
'5': ["#F1E6F1", "#D8BBD8", "#B379B3", "#A05AA0", "#8A4E8A"],
'6': ["#F1E6F1", "#D8BBD8", "#CCA5CC", "#B379B3", "#A05AA0", "#8A4E8A"],
'7': ["#F1E6F1", "#D8BBD8", "#CCA5CC", "#C08FC0", "#B379B3", "#A05AA0", "#8A4E8A"]
},
inverted_purple_states: {
'3': ["#F2D2D3", "#D4686C", "#C1373C"],
'4': ["#F2D2D3", "#EBB7B9", "#CC4E52", "#C1373C"],
'5': ["#F2D2D3", "#EBB7B9", "#D4686C", "#CC4E52", "#C1373C"],
'6': ["#F2D2D3", "#EBB7B9", "#E39D9F", "#D4686C", "#CC4E52", "#C1373C"],
'7': ["#F2D2D3", "#EBB7B9", "#E39D9F", "#DB8286", "#D4686C", "#CC4E52", "#C1373C"]
},
inverted_blue_states: {
'3': ["#ECF0F6", "#6182B5", "#43618F"],
'4': ["#ECF0F6", "#B2C2DB", "#4E71A6", "#43618F"],
'5': ["#ECF0F6", "#B2C2DB", "#6182B5", "#4E71A6", "#43618F"],
'6': ["#ECF0F6", "#B2C2DB", "#9BB0D0", "#6182B5", "#4E71A6", "#43618F"],
'7': ["#ECF0F6", "#B2C2DB", "#9BB0D0", "#849EC5", "#6182B5", "#4E71A6", "#43618F"]
}
};
// Default colors for color/category wizard
cdb.admin.color_brewer = ['#A6CEE3', '#1F78B4', '#B2DF8A', '#33A02C', '#FB9A99', '#E31A1C', '#FDBF6F', '#FF7F00', '#CAB2D6', '#6A3D9A', '#DDDDDD'];
cdb.admin.color_brewer = ['#A6CEE3', '#1F78B4', '#B2DF8A', '#33A02C', '#FB9A99', '#E31A1C', '#FDBF6F', '#FF7F00', '#CAB2D6', '#6A3D9A', '#DDDDDD'];

16
lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard_forms.js
Unescape View File

@ -271,7 +271,9 @@ var color_ramp_polyline = {
'color_ramp': { type: 'select', value: 'red', extra:['pink',
'red', 'black', 'green', 'blue',
'inverted_pink', 'inverted_red', 'inverted_black',
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2'] },
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2',
'blue_states', 'purple_states', 'red_states',
'inverted_blue_states', 'inverted_purple_states', 'inverted_red_states'] },
'line-opacity': { type: 'opacity', value: 0.8 }
}
};
@ -282,7 +284,9 @@ var color_ramp_polygon = {
'color_ramp': { type: 'select', value: 'red', extra:['pink',
'red', 'black', 'green', 'blue',
'inverted_pink', 'inverted_red', 'inverted_black',
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2'] },
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2',
'blue_states', 'purple_states', 'red_states',
'inverted_blue_states', 'inverted_purple_states', 'inverted_red_states'] },
'polygon-opacity': { type: 'opacity', value: 0.8 }
}
};
@ -293,7 +297,9 @@ var color_ramp_point = {
'color_ramp': { type: 'select', value: 'red', extra:['pink',
'red', 'black', 'green', 'blue',
'inverted_pink', 'inverted_red', 'inverted_black',
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2'] },
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2',
'blue_states', 'purple_states', 'red_states',
'inverted_blue_states', 'inverted_purple_states', 'inverted_red_states'] },
'marker-opacity': { type: 'opacity', value: 0.8 }
}
};
@ -567,7 +573,9 @@ cdb.admin.forms.density = {
'color_ramp': { type: 'select', value: 'red', extra:['pink',
'red', 'black', 'green', 'blue',
'inverted_pink', 'inverted_red', 'inverted_black',
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2'] },
'inverted_green', 'inverted_blue', 'spectrum1', 'spectrum2',
'blue_states', 'purple_states', 'red_states',
'inverted_blue_states', 'inverted_purple_states', 'inverted_red_states'] },
'polygon-opacity': { type: 'opacity', value: 0.8 }
}
},

Write Preview
Loading…
Cancel
Save