diff options
| author | bobzel <zzzman@gmail.com> | 2020-08-30 13:43:24 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-08-30 13:43:24 -0400 |
| commit | 5683a5f344dd1c91a339c38061b3788701af0eb8 (patch) | |
| tree | 180d6ea4c865f27f98aeec74f7751fa5c28744a1 | |
| parent | 561a8d0bd130ea5c1fd68a4dd2344f0333d388cc (diff) | |
re-enabled google docs buttons in document decorations.
| -rw-r--r-- | src/client/views/DocumentButtonBar.tsx | 10 | ||||
| -rw-r--r-- | src/client/views/PropertiesButtons.tsx | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/client/views/DocumentButtonBar.tsx b/src/client/views/DocumentButtonBar.tsx index 45336129a..32434490b 100644 --- a/src/client/views/DocumentButtonBar.tsx +++ b/src/client/views/DocumentButtonBar.tsx @@ -317,15 +317,15 @@ export class DocumentButtonBar extends React.Component<{ views: () => (DocumentV {![DocumentType.VID, DocumentType.WEB].includes(StrCast(this.view0.props.Document.type) as DocumentType) ? (null) : <div className="documentButtonBar-button"> {this.annotateButton} </div>} - <div className="documentButtonBar-button"> - {this.moreButton} - </div> - {/* <div className="documentButtonBar-button" style={{ display: !considerPush ? "none" : "" }}> + <div className="documentButtonBar-button" style={{ display: !considerPush ? "none" : "" }}> {this.considerGoogleDocsPush} </div> <div className="documentButtonBar-button" style={{ display: !considerPull ? "none" : "" }}> {this.considerGoogleDocsPull} - </div> */} + </div> + <div className="documentButtonBar-button"> + {this.moreButton} + </div> </div>; } } diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx index dcd3d47cf..921822539 100644 --- a/src/client/views/PropertiesButtons.tsx +++ b/src/client/views/PropertiesButtons.tsx @@ -143,11 +143,8 @@ export class PropertiesButtons extends React.Component<{}, {}> { <div className="propertiesButtons-linker" style={{ backgroundColor: this.pullColor }} onPointerEnter={action(e => { - if (e.altKey) { - this.openHover = UtilityButtonState.OpenExternally; - } else if (e.shiftKey) { - this.openHover = UtilityButtonState.OpenRight; - } + e.altKey && (this.openHover = UtilityButtonState.OpenExternally); + e.shiftKey && (this.openHover = UtilityButtonState.OpenRight); })} onPointerLeave={action(() => this.openHover = UtilityButtonState.Default)} onClick={async e => { @@ -171,8 +168,7 @@ export class PropertiesButtons extends React.Component<{}, {}> { dataDoc.unchanged && runInAction(() => this.isAnimatingFetch = true); } }}> - <FontAwesomeIcon className="documentdecorations-icon" size="lg" - color="black" + <FontAwesomeIcon className="documentdecorations-icon" size="lg" color="black" style={{ WebkitAnimation: animation, MozAnimation: animation }} icon={(() => { switch (this.openHover) { |