Manually merge

This commit is contained in:
Daniel Weissmall 2022-10-19 17:30:50 +03:00
parent 24652d0908
commit 9c79f449c5
2 changed files with 34 additions and 34 deletions

View File

@ -5,7 +5,6 @@ import { useState, useTransition } from "react";
/* -------------------------------------------------------------------------- */
import ContextMenuAction from "../drop-down-menu/ContextMenuAction";
import ContextMenu from "../drop-down-menu/ContextMenu";
import Logofreeland from "../Logofreeland";
import { Button } from "../Button/Button";
import Avatar from "../Avatar";
import Navbar from "../Navbar";
@ -25,8 +24,9 @@ import {
} from "components/icons";
import i18n from "localization/i18n";
import { useTranslation } from "react-i18next";
import LocalizationButton from "components/LocalizationButton";
import Link from "components/typography/Link";
import LocalizationButton from "components/LocalizationButton";
import LogoScipaper from "components/LogoScipaper";
const Header = () => {
const [authenticated, setAuthenticated] = useState(false);
@ -55,7 +55,7 @@ const Header = () => {
<Logo
className={classNames(authenticated ? "w-10" : "w-7 sm:w-10")}
/>
<Logofreeland
<LogoScipaper
className={classNames(authenticated ? "w-28" : "w-20 sm:w-28")}
/>
</Link>