diff options
author | Monika <monika_hedman@brown.edu> | 2019-06-24 15:03:11 -0400 |
---|---|---|
committer | Monika <monika_hedman@brown.edu> | 2019-06-24 15:03:11 -0400 |
commit | d7aa6f30efa6f0c62ad1a3c96bf4ff3871563708 (patch) | |
tree | c185de1734fdff433b473d250bdf741cdfae37de | |
parent | a9ae54044fdb7f10dd01473e711e1afea00d33c1 (diff) |
cleaning up
-rw-r--r-- | src/client/views/search/SearchBox.scss | 11 | ||||
-rw-r--r-- | src/client/views/search/SearchBox.tsx | 31 | ||||
-rw-r--r-- | src/client/views/search/ToggleBar.tsx | 2 |
3 files changed, 19 insertions, 25 deletions
diff --git a/src/client/views/search/SearchBox.scss b/src/client/views/search/SearchBox.scss index 57002a94a..b8791318e 100644 --- a/src/client/views/search/SearchBox.scss +++ b/src/client/views/search/SearchBox.scss @@ -49,14 +49,16 @@ } .filter-form { + padding: 25px; + width: 600px; background: $dark-color; - height: auto; - overflow: auto; position: relative; right: 1px; color: $light-color; flex-direction: column; display: inline-block; + transform-origin: top; + overflow: auto; .filter-header { display: flex; @@ -114,11 +116,6 @@ } } -#filter { - padding: 25px; - width: 600px; -} - #header { text-transform: uppercase; letter-spacing: 2px; diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx index 31e9f5d06..e8b5f35da 100644 --- a/src/client/views/search/SearchBox.tsx +++ b/src/client/views/search/SearchBox.tsx @@ -78,6 +78,20 @@ export class SearchBox extends React.Component { // } } + closeFilterVisual() { + $('document').ready(function () { + var form = document.getElementById("filter-form"); + + if(form){ + if(form.style.maxHeight) { + form.style.maxHeight = null; + form.style + } + + } + }); + } + setupAccordion() { $('document').ready(function () { var acc = document.getElementsByClassName('filter-header'); @@ -87,21 +101,6 @@ export class SearchBox extends React.Component { this.classList.toggle("active"); var panel = this.nextElementSibling as HTMLElement; - // if (panel) { - // console.log(panel.style.transform) - // if (panel.style.display === "inline-block") { - // panel.style.opacity = "0"; - // // panel.style.transform = "scaleY(0)" - // setTimeout(function(){ - // panel.style.display = "none"; - // }, 200); - - // } else { - // panel.style.opacity = "1"; - // // panel.style.transform = "scaleY(1)" - // panel.style.display = "inline-block"; - // } - // } if (panel.style.maxHeight) { panel.style.overflow = "hidden"; panel.style.maxHeight = null; @@ -529,7 +528,7 @@ export class SearchBox extends React.Component { ) : undefined} </div> {this._filterOpen ? ( - <div className="filter-form" onPointerDown={this.stopProp} id="filter" style={this._filterOpen ? { display: "flex" } : { display: "none" }}> + <div className="filter-form" onPointerDown={this.stopProp} id="filter-form" style={this._filterOpen ? { display: "flex" } : { display: "none" }}> <div style={{ display: "flex", width: "100%" }}> <div id="header">Filter Search Results</div> <div className="close-icon" onClick={this.closeFilter}> diff --git a/src/client/views/search/ToggleBar.tsx b/src/client/views/search/ToggleBar.tsx index 5c5e525c8..b0a061270 100644 --- a/src/client/views/search/ToggleBar.tsx +++ b/src/client/views/search/ToggleBar.tsx @@ -81,7 +81,6 @@ export class ToggleBar extends React.Component<ToggleBarProps>{ onclick() { this.forwardTimeline.play(); this.forwardTimeline.reverse(); - // SearchBox.Instance.handleWordQueryChange(); this.props.handleChange(); } @@ -90,7 +89,6 @@ export class ToggleBar extends React.Component<ToggleBarProps>{ if (!this.props.getStatus()) { this.forwardTimeline.play(); this.forwardTimeline.reverse(); - // SearchBox.Instance.handleWordQueryChange(); this.props.handleChange(); } } |