diff options
| author | bob <bcz@cs.brown.edu> | 2019-03-18 09:35:54 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-03-18 09:35:54 -0400 |
| commit | 0b6aa6e7fb31ce0f8085bfee77130f4a276cda80 (patch) | |
| tree | db77102e87dee16fcaa9e7e6931ee5795fa86765 /src/client | |
| parent | a6bd51b13b3f571718f6db9161fdbbc497582336 (diff) | |
tweaks
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/views/collections/CollectionFreeFormView.scss | 4 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionFreeFormView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionVideoView.tsx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss index 9c7a03b52..79ca5fccd 100644 --- a/src/client/views/collections/CollectionFreeFormView.scss +++ b/src/client/views/collections/CollectionFreeFormView.scss @@ -8,11 +8,11 @@ } //nested freeform views - .collectionfreeformview-container { + //.collectionfreeformview-container { // background-image: linear-gradient(to right, $light-color-secondary 1px, transparent 1px), // linear-gradient(to bottom, $light-color-secondary 1px, transparent 1px); // background-size: 30px 30px; - } + //} border: 0px solid $light-color-secondary; border-radius: $border-radius; diff --git a/src/client/views/collections/CollectionFreeFormView.tsx b/src/client/views/collections/CollectionFreeFormView.tsx index 808a22a5d..728076ef8 100644 --- a/src/client/views/collections/CollectionFreeFormView.tsx +++ b/src/client/views/collections/CollectionFreeFormView.tsx @@ -304,7 +304,7 @@ export class CollectionFreeFormView extends CollectionViewBase { onDrop={this.onDrop.bind(this)} onDragOver={this.onDragOver} onBlur={this.onBlur} - style={{ borderWidth: `${COLLECTION_BORDER_WIDTH}px`, }} + style={{ borderWidth: `${COLLECTION_BORDER_WIDTH}px` }}// , zIndex: !this.props.isTopMost ? -1 : undefined }} tabIndex={0} ref={this.createDropTarget}> <div className="collectionfreeformview" diff --git a/src/client/views/collections/CollectionVideoView.tsx b/src/client/views/collections/CollectionVideoView.tsx index b64ef3c07..8fc1a1b4d 100644 --- a/src/client/views/collections/CollectionVideoView.tsx +++ b/src/client/views/collections/CollectionVideoView.tsx @@ -112,7 +112,7 @@ export class CollectionVideoView extends React.Component<CollectionViewProps> { render() { return (<div className="collectionVideoView-cont" ref={this._mainCont} onContextMenu={this.specificContextMenu}> {this.subView} - {this.uIButtons} + {this.props.isSelected() ? this.uIButtons : (null)} </div>) } }
\ No newline at end of file |
