From 737260762c1b7c76d537e935a70f90377d4777ee Mon Sep 17 00:00:00 2001 From: Bina Hovav Date: Sun, 31 Dec 2023 16:38:42 +0200 Subject: [PATCH 1/4] fix: remove extra space at top-pages --- package.json | 2 +- src/App.scss | 4 + src/layout/index.tsx | 1 + src/pages/about/index.tsx | 4 +- src/pages/dashboard/DashboardPage.scss | 3 +- src/pages/dashboard/DashboardPage.tsx | 3 +- src/pages/historicTimeline/index.tsx | 4 +- src/pages/realtimeMap/index.tsx | 2 +- yarn.lock | 10762 +++++++++++++++++++++++ 9 files changed, 10778 insertions(+), 7 deletions(-) create mode 100644 yarn.lock diff --git a/package.json b/package.json index 4cc6c402..6b7af6d0 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "underscore.string": "^3.3.6", "use-konami": "^1.0.1", "usehooks-ts": "^2.9.1", - "vite": "^4.4.9", + "vite": "^5.0.10", "vite-plugin-svgr": "^4.1.0", "vite-tsconfig-paths": "^4.2.1", "web-vitals": "^2.1.4" diff --git a/src/App.scss b/src/App.scss index 85524a57..454b99f0 100644 --- a/src/App.scss +++ b/src/App.scss @@ -6,4 +6,8 @@ .main { flex-direction: row; font-family: Heebo; +} + +.page-title{ + margin-top: 0; } \ No newline at end of file diff --git a/src/layout/index.tsx b/src/layout/index.tsx index 81336db7..2b241f7e 100644 --- a/src/layout/index.tsx +++ b/src/layout/index.tsx @@ -20,6 +20,7 @@ const StyledContent = styled(Content)` ` const StyledBody = styled.div` padding: 24px; + padding-top: 0; min-height: 360px; ` diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx index f053c0d8..3a4d1737 100644 --- a/src/pages/about/index.tsx +++ b/src/pages/about/index.tsx @@ -10,7 +10,7 @@ const About = () => { return ( - קצת עלינו + קצת עלינו @@ -139,7 +139,7 @@ const Funding = () => { const AboutStyle = styled.div` display: flex; flex-direction: column; - padding: 1rem; + padding: 0 1rem; & .about-center-container { width: 100%; max-width: 770px; diff --git a/src/pages/dashboard/DashboardPage.scss b/src/pages/dashboard/DashboardPage.scss index b33b49ff..0d1dc7d1 100644 --- a/src/pages/dashboard/DashboardPage.scss +++ b/src/pages/dashboard/DashboardPage.scss @@ -13,4 +13,5 @@ height: 400px; overflow-y: scroll; } -} \ No newline at end of file +} + diff --git a/src/pages/dashboard/DashboardPage.tsx b/src/pages/dashboard/DashboardPage.tsx index 41fd196a..07501ede 100644 --- a/src/pages/dashboard/DashboardPage.tsx +++ b/src/pages/dashboard/DashboardPage.tsx @@ -7,6 +7,7 @@ import moment from 'moment' // Styling import './DashboardPage.scss' +import 'src/App.scss' import { PageContainer } from '../components/PageContainer' import { useTranslation } from 'react-i18next' import { Alert, Typography } from 'antd' @@ -30,7 +31,7 @@ const DashboardPage = () => { return ( - ביצועי תחבורה ציבורית + ביצועי תחבורה ציבורית { return ( - הסטורית נסיעות + הסטורית נסיעות {/* choose date */} diff --git a/src/pages/realtimeMap/index.tsx b/src/pages/realtimeMap/index.tsx index 04bc27fe..b1b14924 100644 --- a/src/pages/realtimeMap/index.tsx +++ b/src/pages/realtimeMap/index.tsx @@ -92,7 +92,7 @@ export default function RealtimeMapPage() { return ( - {t('realtime_map_explanation').slice(0, 25)} + {t('realtime_map_explanation').slice(0, 25)}