Skip to content
This repository has been archived by the owner on Jul 3, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/6.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jansiegel committed Nov 14, 2018
2 parents 2d16748 + 82e49a2 commit 26125b9
Show file tree
Hide file tree
Showing 80 changed files with 21,399 additions and 23,642 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@
"core-js/*",
"regenerator-runtime/runtime",
"./common",
"./jasmine",
"./../bootstrap",
"./helpers/custom-matchers",
"./MemoryLeakTest"
]
}]
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var hot = new Handsontable(container, {
- Gantt Chart (beta)
- Non-contiguous selection

[See a comparison table](//docs.handsontable.com/pro/tutorial-features.html)
[See a comparison table](//handsontable.com/docs/tutorial-features.html)

<br/>

Expand All @@ -107,9 +107,9 @@ var hot = new Handsontable(container, {
<br/>

### Resources
- [API Reference](//docs.handsontable.com/pro/Core.html)
- [Compatibility](//docs.handsontable.com/pro/tutorial-compatibility.html)
- [Change log](//docs.handsontable.com/pro/tutorial-release-notes.html)
- [API Reference](//handsontable.com/docs/Core.html)
- [Compatibility](//handsontable.com/docs/tutorial-compatibility.html)
- [Change log](//handsontable.com/docs/tutorial-release-notes.html)
- [Roadmap](//trello.com/b/PztR4hpj)
- [Newsroom](//twitter.com/handsontable)

Expand Down
14 changes: 2 additions & 12 deletions dist/handsontable.css

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

2 changes: 1 addition & 1 deletion dist/handsontable.css.map

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

14 changes: 2 additions & 12 deletions dist/handsontable.full.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* RELIABILITY AND PERFORMANCE WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE
* UNINTERRUPTED OR ERROR FREE.
*
* Version: 6.1.1
* Release date: 23/10/2018 (built at 23/10/2018 12:28:31)
* Version: 6.2.0
* Release date: 14/11/2018 (built at 14/11/2018 12:28:46)
*/
/**
* Fix for bootstrap styles
Expand Down Expand Up @@ -1727,16 +1727,6 @@ textarea#HandsontableCopyPaste {
z-index: 1070;
}

/*
AutoColumnSize will NOT count size of filter's value box and filter's selects. These elements should always fit
to another elements elbowing the table. Value box could scale, but we have two problems which were fixed by workaround:
- borders declared for the `table.htCore` are also counted by `offsetWidth` (however it could be fixed by not displaying them for GhostTable)
- MultipleSelectUI basing on Handsontable is built only once, so it's `wtHolder` width is counted only once.
*/
.htGhostTable .htUIMultipleSelectHot, .htGhostTable .htUISelect {
display: none;
}

.htFiltersConditionsMenu .ht_clone_top,
.htFiltersConditionsMenu .ht_clone_left,
.htFiltersConditionsMenu .ht_clone_corner,
Expand Down
Loading

0 comments on commit 26125b9

Please sign in to comment.