diff options
| author | Sam Wilkins <samuel_wilkins@brown.edu> | 2019-05-23 03:53:09 -0400 |
|---|---|---|
| committer | Sam Wilkins <samuel_wilkins@brown.edu> | 2019-05-23 03:53:09 -0400 |
| commit | c1c776687c31582a455940fa298e007eaeb5d19f (patch) | |
| tree | 8bcd75eaa941cb40b0254b64b1df8ce2fc598cd5 /src/client/views/collections | |
| parent | 8fea6a1d622b08cc1386960b94c72caf83cc6531 (diff) | |
| parent | 34b38c7382a40fb2a117d3c7418a81b34fa7ed7f (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/collections')
| -rw-r--r-- | src/client/views/collections/CollectionSubView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/collections/ParentDocumentSelector.scss | 6 | ||||
| -rw-r--r-- | src/client/views/collections/ParentDocumentSelector.tsx | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx index 4a21e4465..c4e72b23a 100644 --- a/src/client/views/collections/CollectionSubView.tsx +++ b/src/client/views/collections/CollectionSubView.tsx @@ -129,7 +129,7 @@ export function CollectionSubView<T>(schemaCtor: (doc: Doc) => T) { options.dropAction = "copy"; } if (type.indexOf("html") !== -1) { - if (path.includes('localhost')) { + if (path.includes(window.location.hostname)) { let s = path.split('/'); let id = s[s.length - 1]; DocServer.GetRefField(id).then(field => { diff --git a/src/client/views/collections/ParentDocumentSelector.scss b/src/client/views/collections/ParentDocumentSelector.scss index 1ab12bb72..2dd3e49f2 100644 --- a/src/client/views/collections/ParentDocumentSelector.scss +++ b/src/client/views/collections/ParentDocumentSelector.scss @@ -1,10 +1,14 @@ .PDS-flyout { position: absolute; z-index: 9999; - background-color: #d3d3d3; + background-color: #eeeeee; box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); min-width: 150px; color: black; + top: 12px; + + padding: 10px; + border-radius: 3px; hr { height: 1px; diff --git a/src/client/views/collections/ParentDocumentSelector.tsx b/src/client/views/collections/ParentDocumentSelector.tsx index e6eb51a0c..f11af04a3 100644 --- a/src/client/views/collections/ParentDocumentSelector.tsx +++ b/src/client/views/collections/ParentDocumentSelector.tsx @@ -50,6 +50,7 @@ export class SelectorContextMenu extends React.Component<SelectorProps> { render() { return ( <> + <p>Contexts:</p> {this._docs.map(doc => <p><a onClick={this.getOnClick(doc)}>{doc.col.title}</a></p>)} {this._otherDocs.length ? <hr></hr> : null} {this._otherDocs.map(doc => <p><a onClick={this.getOnClick(doc)}>{doc.col.title}</a></p>)} @@ -76,13 +77,13 @@ export class ParentDocSelector extends React.Component<SelectorProps> { let flyout; if (this.hover) { flyout = ( - <div className="PDS-flyout"> + <div className="PDS-flyout" title=" "> <SelectorContextMenu {...this.props} /> </div> ); } return ( - <span style={{ position: "relative", display: "inline-block" }} + <span style={{ position: "relative", display: "inline-block", paddingLeft: "5px", paddingRight: "5px" }} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}> <p>^</p> |