From 470e308480233bae9781c3154fdc3da6d818d548 Mon Sep 17 00:00:00 2001 From: Arvid Norlin Date: Thu, 23 May 2024 15:42:52 +0200 Subject: [PATCH] chore: css fixes --- .../currentPointsBalance.module.css | 8 +++++++- .../Blocks/Points/EarnAndBurn/earnAndBurn.module.css | 2 +- .../Points/ExpiringPoints/expiringPoints.module.css | 12 ++++++------ server/routers/user/query.ts | 1 - types/components/myPages/myPage/earnAndBurn.ts | 10 +--------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/components/MyPages/Blocks/Points/CurrentPointsBalance/currentPointsBalance.module.css b/components/MyPages/Blocks/Points/CurrentPointsBalance/currentPointsBalance.module.css index b87ffc0be..d79aea9a8 100644 --- a/components/MyPages/Blocks/Points/CurrentPointsBalance/currentPointsBalance.module.css +++ b/components/MyPages/Blocks/Points/CurrentPointsBalance/currentPointsBalance.module.css @@ -9,6 +9,12 @@ } .points { - font-size: var(--typography-Title-2-Desktop-fontSize); + font-size: var(--typography-Title-2-Mobile-fontSize); margin: 0; } + +@media screen and (min-width: 768px) { + .points { + font-size: var(--typography-Title-2-Desktop-fontSize); + } +} diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css b/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css index f8453d9e1..f0f64cb4c 100644 --- a/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css +++ b/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css @@ -84,7 +84,7 @@ border: 1px solid var(--Main-Grey-10); } -@media screen and (min-width: 950px) { +@media screen and (min-width: 768px) { .mobileTableContainer { display: none; } diff --git a/components/MyPages/Blocks/Points/ExpiringPoints/expiringPoints.module.css b/components/MyPages/Blocks/Points/ExpiringPoints/expiringPoints.module.css index 1a943c8ed..d1acbec8a 100644 --- a/components/MyPages/Blocks/Points/ExpiringPoints/expiringPoints.module.css +++ b/components/MyPages/Blocks/Points/ExpiringPoints/expiringPoints.module.css @@ -5,21 +5,21 @@ } .thead { - background-color: var(--Base-Fill-Normal); - border-left: 1px solid var(--Base-Fill-Normal); - border-right: 1px solid var(--Base-Fill-Normal); + background-color: var(--Main-Grey-10); + border-left: 1px solid var(--Main-Grey-10); + border-right: 1px solid var(--Main-Grey-10); } .tr { - border: 1px solid #e6e9ec; + border: 1px solid var(--Main-Grey-10); } .th { text-align: left; - padding: 20px 32px; + padding: var(--Spacing-x2) var(--Spacing-x4); } .td { text-align: left; - padding: 16px 32px; + padding: var(--Spacing-x2) var(--Spacing-x4); } diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts index ab621383c..4d28194cd 100644 --- a/server/routers/user/query.ts +++ b/server/routers/user/query.ts @@ -15,7 +15,6 @@ import { getUserSchema, } from "./output" import { benefits, extendedUser, nextLevelPerks } from "./temp" -import friendTransactionsMockJson from "./tempFriendTransactions.json" function fakingRequest(payload: T): Promise { return new Promise((resolve) => { diff --git a/types/components/myPages/myPage/earnAndBurn.ts b/types/components/myPages/myPage/earnAndBurn.ts index 71296635c..ee4552a2b 100644 --- a/types/components/myPages/myPage/earnAndBurn.ts +++ b/types/components/myPages/myPage/earnAndBurn.ts @@ -21,13 +21,5 @@ export type Page = { export type RowProps = { lang: Lang - transaction: { - checkinDate: string - checkoutDate: string - awardPoints: number - hotelName?: string - city?: string - nights: number - confirmationNumber: string - } + transaction: Transaction }