diff --git a/my-app/src/components/header.tsx b/my-app/src/components/header.tsx index aca150d..dcd5d42 100644 --- a/my-app/src/components/header.tsx +++ b/my-app/src/components/header.tsx @@ -3,7 +3,7 @@ import MaterialUISwitch from './switch' import { useTheme, ThemeProvider, createTheme } from '@mui/material/styles'; import React, { useState, useContext} from "react"; import { useEffect } from "react"; -import logo from '../img/first.jpg'; +import logo from '../img/logo.png'; import { ColorModeContext } from '../utils/color-toggle'; import { useTranslation } from 'react-i18next'; @@ -69,18 +69,24 @@ function Header() Logo -
- {t("page1")} -
-
- {t("page2")} -
-
- {t("page3")} -
-
- {t("page4")} + +
+
+ {t("page2")} +
+
+ {t("page4")} +
+
+ {t("page1")} +
+
+ {t("page3")} +
+ + +
{/* */} diff --git a/my-app/src/css/contact.css b/my-app/src/css/contact.css index 2828c3b..cb5af5c 100644 --- a/my-app/src/css/contact.css +++ b/my-app/src/css/contact.css @@ -16,7 +16,7 @@ margin-bottom: 5vh; } -.contact_list{ +.contact_list { font-size: 1vw; font-weight: 800; margin-top: 1vh; diff --git a/my-app/src/css/mine.css b/my-app/src/css/mine.css index fbdbae0..cbf4ce5 100644 --- a/my-app/src/css/mine.css +++ b/my-app/src/css/mine.css @@ -54,10 +54,12 @@ body { justify-content: space-between; } - .logo img{ + .logo{ + background-color: black; height: 100%; /* Adjust the size as needed */ - margin-left: 3vw; - margin-right: 20vw; + /* width: 50%; */ + /* margin-left: 3vw; */ + /* margin-right: 20vw; */ margin-bottom: 1vh; } @@ -74,6 +76,16 @@ body { } } + .menu { + display: flex; + flex-direction: row; + width: 50vw; + margin-right: 7vw; + /* align-self: flex-end; */ + justify-content: right; + /* float: right; */ + } + .title { color:black; font-weight: 800; @@ -81,16 +93,13 @@ body { margin-right: 98vw; } - .menu { - float: right; - } .language { align-items: center; display: flex; flex-direction: row; justify-content: right; - width: 50vw; + width: 20vw; margin-top: 0vh; margin-left: 0vw; height: 100%; diff --git a/my-app/src/img/logo.png b/my-app/src/img/logo.png new file mode 100644 index 0000000..6ac0c2a Binary files /dev/null and b/my-app/src/img/logo.png differ diff --git a/my-app/src/img/omv_dashboard.png b/my-app/src/img/omv_dashboard.png index b5a7f21..4e77bf6 100644 Binary files a/my-app/src/img/omv_dashboard.png and b/my-app/src/img/omv_dashboard.png differ