From 7a4a42dae14e0da1a026c2717c5183fa96a9e990 Mon Sep 17 00:00:00 2001 From: anika-ahluwalia Date: Wed, 12 Aug 2020 18:03:49 -0500 Subject: adding tooltips for sally --- src/client/views/MainView.scss | 2 ++ src/client/views/collections/ParentDocumentSelector.tsx | 14 ++++++++------ src/client/views/nodes/FontIconBox.tsx | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'src/client/views') diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss index 44c756b63..a05a2b858 100644 --- a/src/client/views/MainView.scss +++ b/src/client/views/MainView.scss @@ -4,6 +4,8 @@ .dash-tooltip { font-size: 11px; padding: 2px; + max-width: 150; + line-height: 150%; } .mainView-tabButtons { diff --git a/src/client/views/collections/ParentDocumentSelector.tsx b/src/client/views/collections/ParentDocumentSelector.tsx index 4c8cac3ed..149d4927b 100644 --- a/src/client/views/collections/ParentDocumentSelector.tsx +++ b/src/client/views/collections/ParentDocumentSelector.tsx @@ -15,6 +15,7 @@ import { faCog, faChevronCircleUp } from "@fortawesome/free-solid-svg-icons"; import { library } from "@fortawesome/fontawesome-svg-core"; import { DocumentView } from "../nodes/DocumentView"; import { SelectionManager } from "../../util/SelectionManager"; +import { Tooltip } from "@material-ui/core"; const higflyout = require("@hig/flyout"); export const { anchorPoints } = higflyout; export const Flyout = higflyout.default; @@ -121,16 +122,17 @@ export class DockingViewButtonSelector extends React.Component<{ views: () => Do } render() { - return { + return
Tap for toolbar, drag to create alias in another pane
} placement="bottom"> + { if (getComputedStyle(this._ref.current!).width !== "100%") { e.stopPropagation(); e.preventDefault(); } this.props.views()[0]?.select(false); }} className="buttonSelector"> - - - - ; + + + +
+ ; } } diff --git a/src/client/views/nodes/FontIconBox.tsx b/src/client/views/nodes/FontIconBox.tsx index 144defbb0..664999e15 100644 --- a/src/client/views/nodes/FontIconBox.tsx +++ b/src/client/views/nodes/FontIconBox.tsx @@ -11,7 +11,7 @@ import { runInAction, observable, reaction, IReactionDisposer } from 'mobx'; import { Doc } from '../../../fields/Doc'; import { ContextMenu } from '../ContextMenu'; import { ScriptField } from '../../../fields/ScriptField'; -import { Tooltip } from '@material-ui/core'; +import { Tooltip, makeStyles } from '@material-ui/core'; const FontIconSchema = createSchema({ icon: "string", }); @@ -63,6 +63,7 @@ export class FontIconBox extends DocComponent( const color = StrCast(this.layoutDoc.color, this._foregroundColor); const backgroundColor = StrCast(this.layoutDoc._backgroundColor, StrCast(this.rootDoc.backgroundColor, this.props.backgroundColor?.(this.rootDoc, this.props.renderDepth))); const shape = StrCast(this.layoutDoc.iconShape, "round"); + const button =