Skip to content
This repository has been archived by the owner on Feb 16, 2022. It is now read-only.

Commit

Permalink
Merge pull request #128 from phovea/release-8.0.0
Browse files Browse the repository at this point in the history
Release 8.0.0
  • Loading branch information
Anita Steiner committed Sep 8, 2021
2 parents 1c32d4a + 4d503ec commit f16993f
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @thinkh
* @phovea/core @phovea/datavisyn-core
4 changes: 2 additions & 2 deletions dist/import/ImportUtils.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/import/ImportUtils.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/valuetype/valuetypes.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/valuetype/valuetypes.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "phovea_importer",
"description": "Flexible smart and visual data importer for web based visualization",
"homepage": "https://phovea.caleydo.org",
"version": "7.0.0",
"version": "8.0.0",
"author": {
"name": "The Caleydo Team",
"email": "contact@caleydo.org",
Expand Down Expand Up @@ -67,8 +67,8 @@
"dependencies": {
"d3": "~3.5.17",
"papaparse": "~5.3.0",
"phovea_core": "^6.0.0",
"phovea_d3": "^6.0.0",
"phovea_ui": "^6.0.0"
"phovea_core": "^7.0.0",
"phovea_d3": "^6.1.0",
"phovea_ui": "^7.0.0"
}
}
4 changes: 2 additions & 2 deletions src/import/ImportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class ImportUtils {

static async importTable(editors: ValueTypeEditor[], $root: d3.Selection<any>, header: string[], data: string[][], name: string) {
$root.html(`${ImportUtils.commonFields(name)}
<table class="table table-striped table-condensed">
<table class="table table-striped table-sm">
<thead>
<th>${I18nextManager.getInstance().i18n.t('phovea:importer.column')}</th>
<th>${I18nextManager.getInstance().i18n.t('phovea:importer.type')}</th>
Expand Down Expand Up @@ -184,7 +184,7 @@ export class ImportUtils {
<select class="form-control" ${i < 2 ? 'disabled="disabled"' : ''} id="${prefix}_${i}">
${editors.map((editor) => `<option value="${editor.id}" ${d.value.type === editor.id ? 'selected="selected"' : ''}>${editor.name}</option>`).join('\n')}
</select>
<span class="input-group-btn"><button class="btn btn-secondary" ${!d.editor.hasEditor ? 'disabled="disabled' : ''} type="button"><i class="glyphicon glyphicon-cog"></i></button></span>
<span class="input-group-btn"><button class="btn btn-light" ${!d.editor.hasEditor ? 'disabled="disabled' : ''} type="button"><i class="fas fa-cog"></i></button></span>
</div>`);

$rows.select('select').on('change', ValueTypeUtils.updateType(editors, false));
Expand Down
2 changes: 1 addition & 1 deletion src/valuetype/valuetypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ export class ValueTypeUtils {
${options.join('\n')}
</select>
<span class="input-group-btn">
<button class="btn btn-secondary" ${!current || !current.hasEditor ? 'disabled="disabled' : ''} type="button"><i class="glyphicon glyphicon-cog"></i></button>
<button class="btn btn-light" ${!current || !current.hasEditor ? 'disabled="disabled' : ''} type="button"><i class="fas fa-cog"></i></button>
</span>`;
}

Expand Down

0 comments on commit f16993f

Please sign in to comment.