Skip to content

Commit 9cc849b

Browse files
authored
Merge pull request #165 from RhoInc/dev-v2.0.1
CRF Heatmap v2.0.1
2 parents 117ac02 + a21c190 commit 9cc849b

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

crfHeatMap.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,9 +1045,13 @@
10451045
/****---------------------------------------------------------------------------------\
10461046
Row 2 - Controls
10471047
\---------------------------------------------------------------------------------****/
1048-
1048+
'#chm-controls {' + ' display: block;' + '}',
10491049
'#chm-controls .wc-controls {' + ' margin-right: 10px;' + '}',
1050-
'#chm-controls .control-group {' + ' width: 100%;' + ' margin: 0 0 5px 0;' + '}',
1050+
'#chm-controls .control-group {' +
1051+
' width: 100%;' +
1052+
' margin: 0 0 5px 0;' +
1053+
' display: block;' +
1054+
'}',
10511055
'#chm-controls .control-group > * {' + ' display: block;' + ' width: auto;' + '}',
10521056
'#chm-controls .wc-control-label {' + ' text-align: center;' + '}',
10531057
'#chm-controls .span-description {' + '}',

package-lock.json

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "crf-heat-map",
33
"description": "Heat Map showing database form status at different levels",
4-
"version": "2.0.0",
4+
"version": "2.0.1",
55
"author": "Rho, Inc.",
66
"license": "MIT",
77
"homepage": "https://github.com/rhoinc/crf-heat-map#readme",

scripts/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The most straightforward way to customize the CRF Heat Map is by using a configu
33
In addition to the standard Webcharts settings several custom settings not available in the base Webcharts library have been added to the CRF Heat Map to facilitate data mapping and other custom functionality. These custom settings are described in detail below and are set in the [rendererSettings.js file](https://github.com/RhoInc/crf-heat-map/blob/master/src/configuration/rendererSettings.js). All defaults can be overwritten by the passed configuration object.
44

55
# Renderer-specific settings
6-
The sections below describe each crf-heat-map setting as of version 2.0.0.
6+
The sections below describe each crf-heat-map setting as of version 2.0.1.
77

88
## settings.site_col
99
`string`
@@ -287,7 +287,7 @@ Number of rows above which the user will be prompted for confirmation when expan
287287
**default:** `10000`
288288

289289
# Webcharts settings
290-
The object below contains each Webcharts setting as of version 2.0.0.
290+
The object below contains each Webcharts setting as of version 2.0.1.
291291

292292
```
293293
{ return { cols: null, headers: null, // set in rendererSettings applyCSS: true, searchable: false, sortable: false, pagination: false, exportable: true, exports: ['csv', 'xlsx'], dynamicPositioning: false };}}

settings-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"title": "settings",
33
"description": "JSON schema for the configuration of the CRF Heat Map",
44
"overview": "The most straightforward way to customize the CRF Heat Map is by using a configuration object whose properties describe the behavior and appearance of the table. Since the CRF Heat Map is a Webcharts `table` object, many default Webcharts settings are set in the [webchartsSettings.js file](https://github.com/RhoInc/crf-heat-map/blob/master/src/configuration/webchartsSettings.js) as [described below](#webcharts-settings). Refer to the [Webcharts documentation](https://github.com/RhoInc/Webcharts/wiki/Chart-Configuration) for more details on these settings.\nIn addition to the standard Webcharts settings several custom settings not available in the base Webcharts library have been added to the CRF Heat Map to facilitate data mapping and other custom functionality. These custom settings are described in detail below and are set in the [rendererSettings.js file](https://github.com/RhoInc/crf-heat-map/blob/master/src/configuration/rendererSettings.js). All defaults can be overwritten by the passed configuration object.",
5-
"version": "2.0.0",
5+
"version": "2.0.1",
66
"type": "object",
77
"properties": {
88
"site_col" : {

src/defineStyles.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,16 @@ export default function defineStyles() {
113113
/****---------------------------------------------------------------------------------\
114114
Row 2 - Controls
115115
\---------------------------------------------------------------------------------****/
116-
116+
'#chm-controls {' +
117+
' display: block;' +
118+
'}',
117119
'#chm-controls .wc-controls {' +
118120
' margin-right: 10px;' +
119121
'}',
120122
'#chm-controls .control-group {' +
121123
' width: 100%;' +
122124
' margin: 0 0 5px 0;' +
125+
' display: block;' +
123126
'}',
124127
'#chm-controls .control-group > * {' +
125128
' display: block;' +

0 commit comments

Comments
 (0)