diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-08-03 11:03:43 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-08-03 11:03:43 -0500 |
| commit | 19f963aef35237245418f94595ca519d254bcffe (patch) | |
| tree | b80480b7b59846e44c5d9815a432c63d8fa8b6d4 | |
| parent | 23591a0dec82ca7c0fcb3a09c617c031dd2a9218 (diff) | |
minor tweeks
| -rw-r--r-- | src/client/views/MainView.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/FontIconBox.tsx | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index a5dbc0627..d17b0bd32 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -481,6 +481,8 @@ export class MainView extends React.Component { @action @undoBatch closeFlyout = () => { + // this._lastButton && (this._lastButton.color = "white"); + // this._lastButton && (this._lastButton._backgroundColor = ""); this.panelContent = "none"; this.flyoutWidth = 0; } diff --git a/src/client/views/nodes/FontIconBox.tsx b/src/client/views/nodes/FontIconBox.tsx index 2f540e62a..3561d22b6 100644 --- a/src/client/views/nodes/FontIconBox.tsx +++ b/src/client/views/nodes/FontIconBox.tsx @@ -12,6 +12,7 @@ import { Doc } from '../../../fields/Doc'; import { ContextMenu } from '../ContextMenu'; import { ScriptField } from '../../../fields/ScriptField'; import { Tooltip } from '@material-ui/core'; +import { CurrentUserUtils } from '../../util/CurrentUserUtils'; const FontIconSchema = createSchema({ icon: "string", }); @@ -65,11 +66,11 @@ export class FontIconBox extends DocComponent<FieldViewProps, FontIconDocument>( const shape = StrCast(this.layoutDoc.iconShape, "round"); const button = <> <button className={`menuButton-${shape}`} ref={this._ref} onContextMenu={this.specificContextMenu} - style={{ boxShadow: this.layoutDoc.ischecked ? `4px 4px 12px black` : undefined, backgroundColor }}> - <div className="menuButton-wrap"> - {<FontAwesomeIcon className={`menuButton-icon-${shape}`} icon={StrCast(this.dataDoc.icon, "user") as any} color={color} size="lg" />} - {!label ? (null) : <div className="fontIconBox-label" style={{ color, backgroundColor }}> {label} </div>} - </div> + style={{ boxShadow: this.layoutDoc.ischecked ? `4px 4px 12px black` : undefined, }}> + {<FontAwesomeIcon className={`menuButton-icon-${shape}`} + icon={StrCast(this.dataDoc.icon, "user") as any} color={color} + size={this.layoutDoc.iconShape === "square" ? "sm" : "lg"} />} + {!label ? (null) : <div className="fontIconBox-label" style={{ color, backgroundColor }}> {label} </div>} </button> </>; return !this.layoutDoc.toolTip ? button : |