bring in styles #7542

Merged
jessopb merged 21 commits from odystyles into master 2022-04-17 19:04:57 +02:00
2 changed files with 14 additions and 21 deletions
Showing only changes of commit 92928c2143 - Show all commits

View file

@ -165,11 +165,9 @@ const Header = (props: Props) => {
'header--minimal': authHeader, 'header--minimal': authHeader,
'header--mac': IS_MAC, 'header--mac': IS_MAC,
})} })}
// @if TARGET='app'
onDoubleClick={(e) => { onDoubleClick={(e) => {
remote.getCurrentWindow().maximize(); remote.getCurrentWindow().maximize();
}} }}
// @endif
> >
<div className="card__actions--between header__contents"> <div className="card__actions--between header__contents">
{!authHeader && canBackout ? ( {!authHeader && canBackout ? (

View file

@ -8,7 +8,6 @@ import classnames from 'classnames';
import HeaderMenuLink from 'component/common/header-menu-link'; import HeaderMenuLink from 'component/common/header-menu-link';
import Icon from 'component/common/icon'; import Icon from 'component/common/icon';
import React from 'react'; import React from 'react';
import Skeleton from '@mui/material/Skeleton';
type HeaderMenuButtonProps = { type HeaderMenuButtonProps = {
activeChannelClaim: ?ChannelClaim, activeChannelClaim: ?ChannelClaim,
@ -25,24 +24,20 @@ export default function HeaderProfileMenuButton(props: HeaderMenuButtonProps) {
return ( return (
<div className="header__buttons"> <div className="header__buttons">
<Menu> <Menu>
{activeChannelUrl === undefined ? ( <MenuButton
<Skeleton variant="circular" animation="wave" className="header__navigationItem--iconSkeleton" /> aria-label={__('Your account')}
) : ( title={__('Your account')}
<MenuButton className={classnames('header__navigationItem', {
aria-label={__('Your account')} 'header__navigationItem--icon': !activeChannelUrl,
title={__('Your account')} 'header__navigationItem--profilePic': activeChannelUrl,
className={classnames('header__navigationItem', { })}
'header__navigationItem--icon': !activeChannelUrl, >
'header__navigationItem--profilePic': activeChannelUrl, {activeChannelUrl ? (
})} <ChannelThumbnail uri={activeChannelUrl} small noLazyLoad />
> ) : (
{activeChannelUrl ? ( <Icon size={18} icon={ICONS.ACCOUNT} aria-hidden />
<ChannelThumbnail uri={activeChannelUrl} small noLazyLoad /> )}
) : ( </MenuButton>
<Icon size={18} icon={ICONS.ACCOUNT} aria-hidden />
)}
</MenuButton>
)}
<MenuList className="menu__list--header"> <MenuList className="menu__list--header">
<HeaderMenuLink page={PAGES.UPLOADS} icon={ICONS.PUBLISH} name={__('Uploads')} /> <HeaderMenuLink page={PAGES.UPLOADS} icon={ICONS.PUBLISH} name={__('Uploads')} />