diff options
| author | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-07-30 20:08:46 -0400 |
|---|---|---|
| committer | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-07-30 20:08:46 -0400 |
| commit | a5646ecb3eac0a6cf8cfa9a915ea56b399106ef4 (patch) | |
| tree | 00c27200ed4613193ed61dfcb28cc0047c4fd3a2 /src/client/views/collections | |
| parent | 13f45e3c819aaafcff175256ffb8723642c22dca (diff) | |
chrome collapse in right place again
Diffstat (limited to 'src/client/views/collections')
| -rw-r--r-- | src/client/views/collections/CollectionViewChromes.scss | 3 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionViewChromes.tsx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionViewChromes.scss b/src/client/views/collections/CollectionViewChromes.scss index e1a612643..0c2665b1c 100644 --- a/src/client/views/collections/CollectionViewChromes.scss +++ b/src/client/views/collections/CollectionViewChromes.scss @@ -7,8 +7,6 @@ z-index: 9001; transition: top .5s; background: lightgrey; - transition: margin-top .5s; - background: lightgray; padding: 10px; .collectionViewChrome { @@ -41,6 +39,7 @@ position: absolute; width: 40px; transform-origin: top left; + // margin-top: 10px; } .collectionViewBaseChrome-viewSpecs { diff --git a/src/client/views/collections/CollectionViewChromes.tsx b/src/client/views/collections/CollectionViewChromes.tsx index 3bf96bf60..bf1f35a92 100644 --- a/src/client/views/collections/CollectionViewChromes.tsx +++ b/src/client/views/collections/CollectionViewChromes.tsx @@ -189,12 +189,12 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewChro render() { return ( - <div className="collectionViewChrome-cont" style={{ top: this._collapsed ? -100 : 0 }}> + <div className="collectionViewChrome-cont" style={{ top: this._collapsed ? -70 : 0 }}> <div className="collectionViewChrome"> <div className="collectionViewBaseChrome"> <button className="collectionViewBaseChrome-collapse" style={{ - marginTop: this._collapsed ? 60 : 0, + top: this._collapsed ? 70 : 10, transform: `rotate(${this._collapsed ? 180 : 0}deg) scale(${this._collapsed ? 0.5 : 1}) translate(${this._collapsed ? "-100%, -100%" : "0, 0"})`, opacity: (this._collapsed && !this.props.CollectionView.props.isSelected()) ? 0 : 0.9, left: (this._collapsed ? 0 : "unset"), |