diff --git a/frontend/src/Components/MenuItem/MenuItem.module.scss b/frontend/src/Components/MenuItem/MenuItem.module.scss index 03a069961..c3de3f001 100644 --- a/frontend/src/Components/MenuItem/MenuItem.module.scss +++ b/frontend/src/Components/MenuItem/MenuItem.module.scss @@ -7,7 +7,7 @@ max-width: 600px; margin: 0 auto; color: white; - + margin-bottom: 2em; } .item_name { @@ -19,28 +19,23 @@ font-size: 1.25em; margin-bottom: 5px; text-transform: uppercase; - font-family: 'LemonMilkLight', sans-serif; + font-family: $lyche-title-font; } .item_price { - font-size: .75em; + font-size: 0.75em; margin-left: 20px; - margin-top: .25em; - font-family: 'Lora', sans-serif; - color: white; + margin-top: 0.25em; } .item_description { color: dimgray; - font-family: 'Lora', sans-serif; } .item_allergens { color: dimgray; - font-family: 'Lora', sans-serif; } .item_recommendations { color: dimgray; - font-family: 'Lora', sans-serif; } diff --git a/frontend/src/Components/SultenPage/SultenPage.module.scss b/frontend/src/Components/SultenPage/SultenPage.module.scss index f080559c7..72977d4b5 100644 --- a/frontend/src/Components/SultenPage/SultenPage.module.scss +++ b/frontend/src/Components/SultenPage/SultenPage.module.scss @@ -16,10 +16,11 @@ min-width: 100%; min-height: calc(100vh - 200px); z-index: 10; - padding: calc($sulten-navbar-height / 2) 0 calc($sulten-navbar-height / 2) 0; + padding-top: $sulten-navbar-height; @include for-mobile-down { flex-direction: column; padding: 0%; + padding-top: $sulten-navbar-height; } } diff --git a/frontend/src/Pages/LycheMenuPage/LycheMenuPage.tsx b/frontend/src/Pages/LycheMenuPage/LycheMenuPage.tsx index bcb823ca4..4f5d1853c 100644 --- a/frontend/src/Pages/LycheMenuPage/LycheMenuPage.tsx +++ b/frontend/src/Pages/LycheMenuPage/LycheMenuPage.tsx @@ -1,48 +1,43 @@ +import { LycheFrame } from '~/Components/LycheFrame'; import { MenuItem } from '~/Components/MenuItem'; import { SultenPage } from '~/Components/SultenPage'; export function LycheMenuPage() { return ( - + + -

-

+ - + -

-

- - - -

- - + +
); } diff --git a/frontend/src/_constants.scss b/frontend/src/_constants.scss index 7260adfb9..0b0e2900a 100644 --- a/frontend/src/_constants.scss +++ b/frontend/src/_constants.scss @@ -81,10 +81,9 @@ $theme-dark: 'theme-dark'; // Must match THEME.DARK $theme-light: 'theme-light'; // Must match THEM.LIGHT //Lyche -$lyche-title-font:'LemonMilkLight', sans-serif; +$lyche-title-font: 'LemonMilkLight', sans-serif; +$lyche-primary-font: 'Lora', sans-serif; //Assets $lyche-menu-divider-left: url('~/assets/lyche/menu-detail-left.png'); $lyche-menu-divider-right: url('~/assets/lyche/menu-detail-right.png'); - -