diff --git a/ui/component/channelStakedIndicator/view.jsx b/ui/component/channelStakedIndicator/view.jsx index fb6ba849f..2103938d9 100644 --- a/ui/component/channelStakedIndicator/view.jsx +++ b/ui/component/channelStakedIndicator/view.jsx @@ -1,5 +1,4 @@ // @flow -import { SIMPLE_SITE } from 'config'; import * as ICONS from 'constants/icons'; import React from 'react'; import classnames from 'classnames'; @@ -39,33 +38,31 @@ function ChannelStakedIndicator(props: Props) { const icon = getChannelIcon(level); return ( - SIMPLE_SITE && ( - -
- -
+ +
+ +
-
- {__('Level %current_level%', { current_level: level })} -
- } size={14} /> -
+
+ {__('Level %current_level%', { current_level: level })} +
+ } size={14} />
- } - > -
-
- - ) + } + > +
+ +
+ ); } diff --git a/ui/component/comment/view.jsx b/ui/component/comment/view.jsx index b33af33d8..772547fc5 100644 --- a/ui/component/comment/view.jsx +++ b/ui/component/comment/view.jsx @@ -241,7 +241,7 @@ function Comment(props: Props) {
{isGlobalMod && ( - + @@ -249,7 +249,7 @@ function Comment(props: Props) { )} {isModerator && ( - + diff --git a/ui/component/common/tooltip.jsx b/ui/component/common/tooltip.jsx index fd06493ab..11753e539 100644 --- a/ui/component/common/tooltip.jsx +++ b/ui/component/common/tooltip.jsx @@ -1,18 +1,30 @@ // @flow -import type { Node } from 'react'; import React from 'react'; -import ReachTooltip from '@reach/tooltip'; -// import '@reach/tooltip/styles.css'; --> 'scss/third-party.scss' +import MUITooltip from '@mui/material/Tooltip'; +import type { Node } from 'react'; type Props = { - label: string | Node, + arrow?: boolean, children: Node, + disableInteractive?: boolean, + enterDelay?: number, + title?: string | Node, }; function Tooltip(props: Props) { - const { children, label } = props; + const { arrow = true, children, disableInteractive = true, enterDelay = 300, title } = props; - return {children}; + return ( + + {children} + + ); } export default Tooltip; diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx index fe919a4f6..b9dd30185 100644 --- a/ui/component/header/view.jsx +++ b/ui/component/header/view.jsx @@ -11,6 +11,7 @@ import Logo from 'component/logo'; import NotificationBubble from 'component/notificationBubble'; import React from 'react'; import SkipNavigationButton from 'component/skipNavigationButton'; +import Tooltip from 'component/common/tooltip'; import WunderBar from 'component/wunderbar'; import * as remote from '@electron/remote'; import { IS_MAC } from 'component/app/view'; @@ -121,22 +122,32 @@ const Header = (props: Props) => { const userButtons = (className: string) => (
-
+
diff --git a/ui/component/headerMenuButtons/view.jsx b/ui/component/headerMenuButtons/view.jsx index adc5835a4..3000e9958 100644 --- a/ui/component/headerMenuButtons/view.jsx +++ b/ui/component/headerMenuButtons/view.jsx @@ -7,6 +7,7 @@ import HeaderMenuLink from 'component/common/header-menu-link'; import Icon from 'component/common/icon'; import NotificationHeaderButton from 'component/headerNotificationButton'; import React from 'react'; +import Tooltip from 'component/common/tooltip'; type HeaderMenuButtonProps = { authenticated: boolean, @@ -24,13 +25,11 @@ export default function HeaderMenuButtons(props: HeaderMenuButtonProps) { return (
- - - + + + + + @@ -41,13 +40,11 @@ export default function HeaderMenuButtons(props: HeaderMenuButtonProps) { {notificationsEnabled && } - - - + + + + + diff --git a/ui/component/headerNotificationButton/view.jsx b/ui/component/headerNotificationButton/view.jsx index eb1f99e3c..06c0ce9f8 100644 --- a/ui/component/headerNotificationButton/view.jsx +++ b/ui/component/headerNotificationButton/view.jsx @@ -7,6 +7,7 @@ import Button from 'component/button'; import Icon from 'component/common/icon'; import NotificationBubble from 'component/notificationBubble'; import React from 'react'; +import Tooltip from 'component/common/tooltip'; type Props = { unseenCount: number, @@ -28,14 +29,14 @@ export default function NotificationHeaderButton(props: Props) { if (!notificationsEnabled) return null; return ( - + + + ); } diff --git a/ui/scss/component/_channel.scss b/ui/scss/component/_channel.scss index b83d89498..986b1c50b 100644 --- a/ui/scss/component/_channel.scss +++ b/ui/scss/component/_channel.scss @@ -363,17 +363,6 @@ $actions-z-index: 2; } } -.channel-staked__tooltip { - display: flex; - align-items: center; - line-height: 1rem; -} - -.channel-staked__tooltip-text { - margin-left: var(--spacing-xs); - font-size: var(--font-xsmall); -} - .channel-staked__wrapper { display: flex; position: absolute; diff --git a/ui/scss/component/_tooltip.scss b/ui/scss/component/_tooltip.scss index 2013b410a..896a040b3 100644 --- a/ui/scss/component/_tooltip.scss +++ b/ui/scss/component/_tooltip.scss @@ -1,8 +1,24 @@ -[data-reach-tooltip] { - border-radius: var(--border-radius); - background-color: var(--color-tooltip-bg); - color: var(--color-tooltip-text); - border: none; - padding: var(--spacing-s); - overflow: hidden; +.MuiTooltip-tooltip { + border-radius: var(--border-radius) !important; + background-color: var(--color-tooltip-bg) !important; + color: var(--color-tooltip-text) !important; + font-size: var(--font-small) !important; +} + +.MuiTooltip-arrow { + color: var(--color-tooltip-bg) !important; + font-size: var(--font-xxsmall) !important; +} + +.channel-staked__tooltip { + display: flex; + align-items: center; + line-height: 1rem; + padding: var(--spacing-xs); + + .channel-staked__tooltip-text { + margin-left: var(--spacing-xs); + font-size: var(--font-xsmall); + font-size: var(--font-small); + } } diff --git a/ui/scss/themes/dark.scss b/ui/scss/themes/dark.scss index bebc2af07..eb39ad54a 100644 --- a/ui/scss/themes/dark.scss +++ b/ui/scss/themes/dark.scss @@ -123,6 +123,7 @@ --color-purchased-text: var(--color-gray-5); --color-thumbnail-background: var(--color-gray-5); --color-tooltip-bg: #2f3337; + --color-tooltip-text: #fafafa; --color-help-warning-bg: #d97706; --color-help-warning-text: white; --color-blockquote: var(--color-gray-5);