Fixed issue from merge and conflict

data-for-change · Feb 21, 2024 · a6f633c · a6f633c
1 parent 67bccd2
commit a6f633c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/src/components/molecules/Header.tsx b/src/components/molecules/Header.tsx
@@ -14,7 +14,6 @@ import { SignInIcon } from 'components/atoms/SignInIcon';
 import MapDialog from 'components/molecules/MapDialog';
 import { IPoint } from 'models/Point';
 import { useNavigate } from 'react-router-dom';
-import n12Logo from 'assets/n12Logo.png';
 import anywayLogo from 'assets/anyway.png';
 
 
@@ -99,12 +98,6 @@ const Header: FC = () => {
     <AppBar>
       <Logo src={logo} alt={'Anyway'} height={30} onClick={reloadHomePage} />
       <Box className={classes.userSection}>
-        <Button.Standard onClick={() => changeTheme('n12')}>
-          <Logo src={n12Logo} alt={'n12'} height={25} />
-        </Button.Standard>
-        <Button.Standard onClick={() => changeTheme('default')}>
-          <Logo src={anywayLogo} alt={'anyway'} height={25} />
-        </Button.Standard>
         <Button.Standard onClick={() => setOpen(true)}>{t('header.Search')}</Button.Standard>
         {FEATURE_FLAGS.language && <LanguageMenu />}
         {authElement}

diff --git a/src/style/default/_defaultColors.ts b/src/style/default/_defaultColors.ts
@@ -1,6 +1,4 @@
 //blue base collection
-import {darkestRed, grayBeige, softRed} from "../n12/_n12_colors";
-
 export const blueVioletColor = '#3f51b5';
 export const skyBlueColor = '#00aaff';
 export const oceanBlueColor = '#0088cc';