Skip to content

Commit

Permalink
Merge branch 'release/0.12.0-beta.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Jul 31, 2020
2 parents 42e9d87 + 21807a1 commit af61fac
Show file tree
Hide file tree
Showing 54 changed files with 801 additions and 663 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "lts/erbium"
- "lts/dubnium"
cache:
yarn: true
directories:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@ $ npm install

We recommend using node.js v12 or greater to build the library and run tests.

Once complete run `npm test && npm prod` from the top of the application directory to run all tests and build the LocusZoom library bundle.
Once complete run `npm run build` from the top of the application directory to run all tests and build the LocusZoom library bundle.

This build process will also write sourcemaps, to help with debugging code even in production environments.

#### Other supported gulp commands:
* `npm run test` - Run unit tests (optional: `npm run test:coverage` to output a code coverage report)
* `npm run dev` - Automatically rebuild the library whenever code changes (development mode)
* `npm run prod` - Build the library for release (production mode)
* `npm run build` - Run tests, and if they pass, build the library for release
* `npm run css` - Rebuild the CSS using SASS
* `npm run docs` - Build the library documentation

Expand Down
3 changes: 3 additions & 0 deletions css/locuszoom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,9 @@ div.#{$namespace}-data_layer-tooltip-arrow_bottom_right {
.#{$namespace}-toolbar-button-group-middle { border-radius: 0px !important; border-left-width: 0px !important; }
.#{$namespace}-toolbar-button-group-end { border-radius: 0px 3px 3px 0px !important; border-left-width: 0px !important; }

input {
line-height: normal; // override a bootstrap behavior so that text fields look good in toolbar
}
}

.#{$namespace}-panel-toolbar > .#{$namespace}-toolbar-left {
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 af61fac

Please sign in to comment.