Skip to content

Commit

Permalink
Merge branch 'release/0.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Aug 13, 2020
2 parents 64c1b13 + 467120b commit 62ef980
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "localzoom",
"version": "0.6.2",
"version": "0.6.3",
"license": "MIT",
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -14,7 +14,7 @@
"bootstrap": "^4.4.1",
"bootstrap-vue": "^2.0.0-rc.11",
"gwas-credible-sets": "^0.1.0",
"locuszoom": "0.12.0-beta.4",
"locuszoom": "0.12.0-beta.5",
"lodash": "^4.17.11",
"tabix-reader": "^1.0.0",
"tabulator-tables": "^4.1.4",
Expand Down
2 changes: 0 additions & 2 deletions src/util/lz-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,8 @@ function getBasicLayout(initial_state = {}, study_panels = [], mods = {}) {
LocusZoom.Layouts.get('panel', 'genes', { proportional_height: 0.5 }),
];

const toolbar = LocusZoom.Layouts.get('toolbar', 'region_nav_plot', { unnamespaced: true });
const extra = Object.assign({
state: initial_state,
toolbar,
panels,
}, mods);
return LocusZoom.Layouts.get('plot', 'standard_association', extra);
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5849,10 +5849,10 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.0"

[email protected].4:
version "0.12.0-beta.4"
resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0-beta.4.tgz#640501c40f2981d00b2386057b2a18d2787c3f42"
integrity sha512-tsX2vIu6KLCfi338duaE8dpiSRgl1S9mruugOPhK/HFQ5skpQLagWZKY9VLVNMCS+1zu3dkWPxHA2kKx/c10Kg==
[email protected].5:
version "0.12.0-beta.5"
resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0-beta.5.tgz#aea4e25507f933ab0a0507e539832bffb82c8dfb"
integrity sha512-HVvMl1Qn4xQrU2dVz3lcZWYUxeMyKLBKBqP0yL3EYqZ/uw9dP8GIQk0GcO+UVeLBx2nAPBWqhHFE6RYSAC98QA==
dependencies:
d3 "^5.16.0"

Expand Down

0 comments on commit 62ef980

Please sign in to comment.