From de75dacadc556c587bad0006638aab89a21ed7e0 Mon Sep 17 00:00:00 2001 From: Geireann Lindfield Roberts <60007097+geireann@users.noreply.github.com> Date: Mon, 10 Jul 2023 16:15:57 -0400 Subject: updated to v54 of comp library --- src/client/views/nodes/button/FontIconBox.tsx | 8 +++++--- src/client/views/topbar/TopBar.tsx | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/client/views/nodes/button/FontIconBox.tsx b/src/client/views/nodes/button/FontIconBox.tsx index 8314f2d86..d181de8d0 100644 --- a/src/client/views/nodes/button/FontIconBox.tsx +++ b/src/client/views/nodes/button/FontIconBox.tsx @@ -1,7 +1,7 @@ import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Tooltip } from '@material-ui/core'; -import { ColorPicker, Dropdown, DropdownType, IconButton, IListItemProps, OrientationType, Size, Toggle, ToggleType, Type } from 'browndash-components'; +import { ColorPicker, Dropdown, DropdownType, IconButton, IListItemProps, Size, Toggle, ToggleType, Type } from 'browndash-components'; import { action, computed, observable, runInAction } from 'mobx'; import { observer } from 'mobx-react'; import * as React from 'react'; @@ -337,7 +337,7 @@ export class FontIconBox extends DocComponent() { ); return ( - + ) return ( @@ -419,6 +419,8 @@ export class FontIconBox extends DocComponent() { setTimeout(() => Doc.UnBrushAllDocs()); e.stopPropagation(); }} + color={color} + type={Type.PRIM} icon={this.Icon(color)!} tooltip={tooltip} /> @@ -562,7 +564,7 @@ export class FontIconBox extends DocComponent() { // shortcut: '#', } )); - button = + button = break; case ButtonType.ColorButton: button = this.colorButton; break; case ButtonType.NumberDropdownButton: button = this.numberDropdownButton; break; diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx index 80294917f..b613a0e3e 100644 --- a/src/client/views/topbar/TopBar.tsx +++ b/src/client/views/topbar/TopBar.tsx @@ -95,7 +95,7 @@ export class TopBar extends React.Component {