opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Charts: Fix resizing

Browse Source
This commit is contained in:
Aysam Guerler
2014-05-17 10:45:14 -04:00
parent 9f05fec27c
commit f06dd3c29e
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/charts/static/app.css
+2 -2
View File
@@ -54,13 +54,13 @@
display: inline-block;
}
.charts-viewport .container {
.charts-viewport .charts-viewport-container {
float: left;
display: block;
height: 100%;
}
.charts-viewport .canvas {
.charts-viewport .charts-viewport-canvas {
display: block;
width:100%;
height: inherit;
config/plugins/visualizations/charts/static/build-app.js
+1 -1
View File
File diff suppressed because one or more lines are too long
config/plugins/visualizations/charts/static/charts/nvd3_histogram/wrapper.js
+1 -1
View File
@@ -23,7 +23,7 @@ return Backbone.View.extend(
},
y: {
index: index++
},
}
}
}
config/plugins/visualizations/charts/static/charts/nvd3_histogram_discrete/config.js
+5 -4
View File
@@ -1,12 +1,13 @@
define(['plugin/charts/nvd3/config'], function(nvd3_config) {
return $.extend(true, {}, nvd3_config, {
title : 'Histogram',
category : 'Histograms',
execute : 'histogram_discrete',
title : 'Histogram (discrete)',
category : 'Data processing (requires \'charts\' tool from Toolshed)',
execute : 'histogramdiscrete',
columns : {
y : {
title : 'Observations'
title : 'Observations',
is_label : true
}
},
settings : {
config/plugins/visualizations/charts/static/charts/types.js
+3
View File
@@ -4,6 +4,7 @@ define(['plugin/charts/nvd3_bar/config',
'plugin/charts/nvd3_bar_horizontal/config',
'plugin/charts/nvd3_bar_horizontal_stacked/config',
'plugin/charts/nvd3_histogram/config',
'plugin/charts/nvd3_histogram_discrete/config',
'plugin/charts/nvd3_line/config',
'plugin/charts/nvd3_line_focus/config',
'plugin/charts/nvd3_pie/config',
@@ -18,6 +19,7 @@ define(['plugin/charts/nvd3_bar/config',
nvd3_bar_horizontal,
nvd3_bar_horizontal_stacked,
nvd3_histogram,
nvd3_histogram_discrete,
nvd3_line,
nvd3_line_focus,
nvd3_pie,
@@ -46,6 +48,7 @@ return Backbone.Model.extend(
'nvd3_scatter' : nvd3_scatter,
'nvd3_pie' : nvd3_pie,
'nvd3_histogram' : nvd3_histogram,
//'nvd3_histogram_discrete' : nvd3_histogram_discrete,
'highcharts_boxplot' : highcharts_boxplot,
'heatmap' : heatmap
}
config/plugins/visualizations/charts/static/views/viewport.js
+2 -2
View File
@@ -282,9 +282,9 @@ return Backbone.View.extend({
// template svg/div element
_templateContainer: function(tag, width) {
return '<div class="container" style="width:' + width + '%;">' +
return '<div class="charts-viewport-container" style="width:' + width + '%;">' +
'<div id="menu"/>' +
'<' + tag + ' id="canvas" class="canvas">' +
'<' + tag + ' id="canvas" class="charts-viewport-canvas">' +
'</div>';
}