From a6f633cd45d2aef3ccb6c6d99d736ec716db5743 Mon Sep 17 00:00:00 2001 From: Shaked Hayek Date: Wed, 21 Feb 2024 22:46:42 +0200 Subject: [PATCH] Fixed issue from merge and conflict --- src/components/molecules/Header.tsx | 7 ------- src/style/default/_defaultColors.ts | 2 -- 2 files changed, 9 deletions(-) diff --git a/src/components/molecules/Header.tsx b/src/components/molecules/Header.tsx index 563ac63f..abae928f 100644 --- 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 = () => { - changeTheme('n12')}> - - - changeTheme('default')}> - - setOpen(true)}>{t('header.Search')} {FEATURE_FLAGS.language && } {authElement} diff --git a/src/style/default/_defaultColors.ts b/src/style/default/_defaultColors.ts index 95a05e17..7e17d1a9 100644 --- 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';