Fix max-height issue with Full Screen Query Results (#1323)

This commit is contained in:
Kyle Knight 2017-03-01 13:11:09 -06:00 committed by GitHub
parent 4561aedd1f
commit 169535afab
4 changed files with 16 additions and 12 deletions

View File

@ -1,3 +1,5 @@
* Fix issue with Distributed Query Pack results full screen feature that broke the browser scrolling abilities
## Kolide 1.0.1 (February 27, 2017) ##
* Fix an issue that prevented users from replacing deleted labels with a new label of the same name.

View File

@ -88,7 +88,6 @@ class SelectTargetsDropdown extends Component {
const currentWrapperHeight = coreWrapper.scrollHeight;
if (wrapperHeight < currentWrapperHeight) {
console.log(`Grow wrapper by ${currentWrapperHeight - wrapperHeight}px`);
coreWrapper.style.height = `${wrapperHeight + (currentWrapperHeight - wrapperHeight) + 15}px`;
}
}

View File

@ -4,7 +4,9 @@
background-color: $white;
padding: $pad-base;
width: 100%;
min-height: calc(500px + (#{$pad-base} * 2));
box-sizing: border-box;
max-height: 75vh;
&__button-wrap {
@include clearfix;

View File

@ -98,7 +98,10 @@ export class QueryPage extends Component {
}
componentWillUnmount () {
const { dispatch } = this.props;
this.resetCampaignAndTargets();
dispatch(toggleSmallNav);
return false;
}
@ -296,22 +299,20 @@ export class QueryPage extends Component {
right: `${rect.right - rect.left}px`,
bottom: `${rect.bottom - rect.top}px`,
maxWidth: `${parent.offsetWidth}px`,
minWidth: `${parent.offsetWidth}px`,
maxHeight: `${parent.offsetHeight}px`,
minHeight: `${parent.offsetHeight}px`,
position: 'fixed',
};
const resetPosition = {
position: 'static',
maxWidth: 'auto',
minWidth: 'auto',
maxHeight: 'auto',
minHeight: 'auto',
top: 'auto',
right: 'auto',
bottom: 'auto',
left: 'auto',
position: null,
maxWidth: null,
minWidth: null,
maxHeight: null,
minHeight: null,
top: null,
right: null,
bottom: null,
left: null,
};
let newPosition = clone(defaultPosition);