Skip to content

Commit 5ab425d

Browse files
committed
[merge][s] - Merge master branch int fix/data-explorer-background-color.
2 parents a97fa4b + 13f6f5f commit 5ab425d

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

ckanext/dataexplorer/public/css/recline.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,19 @@ body {
2121
.recline-slickgrid {
2222
height: 600px;
2323
}
24+
25+
@media screen and (min-width:2100px) and (min-height:850px){
26+
.recline-slickgrid {
27+
height: 800px;
28+
}
29+
}
30+
31+
@media screen and (min-width:2100px) and (min-height:1250px){
32+
.recline-slickgrid {
33+
height: 1200px;
34+
}
35+
}
36+
2437
/*
2538
.recline-timeline .vmm-timeline {
2639
height: 600px;

ckanext/dataexplorer/public/css/recline.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ckanext/dataexplorer/public/vendor/recline/recline.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,6 +3245,14 @@ my.SlickGrid = Backbone.View.extend({
32453245
formatter: formatter,
32463246
validator:validator(field)
32473247
};
3248+
3249+
// setting column.width dinamically
3250+
var numFields = self.model.fields.length;
3251+
// compute column widths
3252+
var fullWidth = self.$el.width();
3253+
var width = parseInt(Math.max(column.minWidth, fullWidth / numFields), 10);
3254+
column.width = width;
3255+
32483256
var widthInfo = _.find(self.state.get('columnsWidth'),function(c){return c.column === field.id;});
32493257
if (widthInfo){
32503258
column.width = widthInfo.width;

0 commit comments

Comments
 (0)