Skip to content

Commit

Permalink
Merge branch 'release/0.13.0-beta.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Dec 11, 2020
2 parents 4392b5d + 984e11a commit dfac174
Show file tree
Hide file tree
Showing 47 changed files with 1,839 additions and 1,742 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Unit tests

on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop
release:
types:
- created

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 14.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Cache Node.js modules
uses: actions/cache@v2
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
- name: Build and test package
run: |
npm ci
npm run build
npm run test
env:
CI: true
22 changes: 0 additions & 22 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LocusZoom is a Javascript/d3 embeddable plugin for interactively visualizing statistical genetic data from customizable
sources.

[![Build Status](https://api.travis-ci.org/statgen/locuszoom.svg?branch=master)](https://api.travis-ci.org/statgen/locuszoom)
![Build Status](https://github.com/statgen/locuszoom/workflows/Unit%20tests/badge.svg?branch=develop)

See [github.com/statgen/locuszoom/wiki](https://github.com/statgen/locuszoom/wiki) for full documentation and API reference.

Expand Down
1 change: 0 additions & 1 deletion assets/docs/layout_tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,6 @@ existing_datasources
.add("assoc_study3", ["AssociationLZ", {url: "/api/association/", params: { source: 3 }}]);
const new_panel = existing_plot.addPanel(extra_panel_layout); // Adds the panel and redraws plot
new_panel.addBasicLoader(); // Add a nice "loading" indicator for UI
```

### Common issues
Expand Down
8 changes: 7 additions & 1 deletion css/locuszoom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,16 @@ svg.#{$namespace}-locuszoom {
stroke-width: 1px;
}

rect.#{$namespace}-data_layer-intervals.#{$namespace}-interval_rect {
g.#{$namespace}-data_layer-intervals {
stroke-width: 0px;
}

rect.#{$namespace}-data_layer-intervals-highlighted, rect.#{$namespace}-data_layer-intervals-selected {
stroke: #{$default_black};
stroke-opacity: #{$default_black_opacity};
stroke-width: 1px;
}

path.#{$namespace}-data_layer-forest {
stroke: #{$default_black_shadow};
stroke-opacity: #{$default_black_shadow_opacity};
Expand Down
4 changes: 2 additions & 2 deletions dist/ext/lz-aggregation-tests.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ext/lz-aggregation-tests.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/ext/lz-credible-sets.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ext/lz-credible-sets.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/ext/lz-dynamic-urls.min.js

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

Loading

0 comments on commit dfac174

Please sign in to comment.