diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/views/ContextMenu.scss | 15 | ||||
| -rw-r--r-- | src/client/views/ContextMenu.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/MainView.tsx | 2 | ||||
| -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 |
6 files changed, 19 insertions, 13 deletions
diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss index b12ee3faa..61ae69179 100644 --- a/src/client/views/ContextMenu.scss +++ b/src/client/views/ContextMenu.scss @@ -31,8 +31,8 @@ } .contextMenu-item { - width: 11vw; //10vw - height: 2.5vh; //2vh + // width: 11vw; //10vw + height: 30px; //2vh background: #DDDDDD; display: flex; //comment out to allow search icon to be inline with search text justify-content: left; @@ -48,9 +48,9 @@ border-style: none; border-color: $intermediate-color; // rgb(187, 186, 186); border-bottom-style: solid; - padding: 10px 0px 10px 0px; + // padding: 10px 0px 10px 0px; white-space: nowrap; - font-size: 1vw; + font-size: 20px; } .contextMenu-item:hover { @@ -59,13 +59,14 @@ } .contextMenu-description { - font-size: 1vw; + font-size: 20px; text-align: left; - width: 8vw; display: inline; //need this? } .icon-background { background-color: #DDDDDD; - margin-right: 2px; + width: 35px; + text-align: center; + font-size: 22px; }
\ No newline at end of file diff --git a/src/client/views/ContextMenu.tsx b/src/client/views/ContextMenu.tsx index 84c17a642..542d259d6 100644 --- a/src/client/views/ContextMenu.tsx +++ b/src/client/views/ContextMenu.tsx @@ -92,7 +92,7 @@ export class ContextMenu extends React.Component { <span className="icon-background"> <FontAwesomeIcon icon="search" size="lg" /> </span> - <input className="contextMenu-item" type="text" placeholder="Search . . ." value={this._searchString} onChange={this.onChange} /> + <input className="contextMenu-item contextMenu-description" type="text" placeholder="Search . . ." value={this._searchString} onChange={this.onChange} /> </span> {this._items.filter(prop => prop.description.toLowerCase().indexOf(this._searchString.toLowerCase()) !== -1). map(prop => <ContextMenuItem {...prop} key={prop.description} />)} diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index 1d491d11f..438607157 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -220,7 +220,7 @@ export class MainView extends React.Component { let videourl = "http://techslides.com/demos/sample-videos/small.mp4"; let addTextNode = action(() => Docs.TextDocument({ borderRounding: -1, width: 200, height: 200, title: "a text note" })); - let addColNode = action(() => Docs.FreeformDocument([], { width: 200, height: 200, title: "a freeform collection" })); + let addColNode = action(() => Docs.FreeformDocument([], { width: this.pwidth * .7, height: this.pheight, title: "a freeform collection" })); let addSchemaNode = action(() => Docs.SchemaDocument(["title"], [], { width: 200, height: 200, title: "a schema collection" })); let addTreeNode = action(() => CurrentUserUtils.UserDocument); //let addTreeNode = action(() => Docs.TreeDocument([CurrentUserUtils.UserDocument], { width: 250, height: 400, title: "Library:" + CurrentUserUtils.email, dropAction: "alias" })); 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> |