Skip to content

Commit 1525272

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 390339f + b2a81ed commit 1525272

File tree

6 files changed

+16
-2023
lines changed

6 files changed

+16
-2023
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Description: 'LineUp' is an interactive technique designed to create, visualize
55
This is a 'htmlwidget' wrapper around the JavaScript library 'LineUp.js'.
66
It is designed to be used in 'R Shiny' apps and 'R Markddown' files.
77
Due to an outdated 'webkit' version of 'RStudio' it won't work in the intergrated viewer.
8-
Version: 3.1.7
9-
Date: 2018-11-08
8+
Version: 3.2.2
9+
Date: 2019-09-17
1010
Authors@R: person("Samuel", "Gratzl", email = "[email protected]", role = c("aut", "cre"))
1111
Maintainer: Samuel Gratzl <[email protected]>
1212
URL: https://github.com/lineupjs/lineup_htmlwidget/

inst/htmlwidgets/dist/LineUpJS.css

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

inst/htmlwidgets/dist/LineUpJS.js

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

inst/htmlwidgets/dist/LineUpJS.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inst/htmlwidgets/lineup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
el.style.height = height;
146146
el.style.position = 'relative';
147147
el.style.overflow = 'auto';
148+
el.style.lineHeight = 'normal'; // for bootstrap
148149

149150
const unsupportedBrowser = !window.LineUpJS || (LineUpJS.isBrowserSupported === 'function' && !LineUpJS.isBrowserSupported());
150151

inst/htmlwidgets/lineup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: lineupjs
3-
version: 3.1.7
3+
version: 3.2.2
44
src: htmlwidgets/dist
55
script:
66
- LineUpJS.js

0 commit comments

Comments
 (0)