diff --git a/apps/partner-sas/app/[lang]/layout.tsx b/apps/partner-sas/app/[lang]/layout.tsx index a4197abd4..e797fdc6d 100644 --- a/apps/partner-sas/app/[lang]/layout.tsx +++ b/apps/partner-sas/app/[lang]/layout.tsx @@ -1,5 +1,6 @@ import "@scandic-hotels/design-system/fonts.css" import "@scandic-hotels/design-system/style.css" +import "@scandic-hotels/design-system/normalize.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css" import "../../globals.css" diff --git a/apps/partner-sas/globals.css b/apps/partner-sas/globals.css index 72e6af58e..494728be1 100644 --- a/apps/partner-sas/globals.css +++ b/apps/partner-sas/globals.css @@ -43,15 +43,8 @@ } } -* { - margin: 0; - box-sizing: border-box; -} - html, body { - margin: 0; - padding: 0; scroll-behavior: smooth; } @@ -67,10 +60,6 @@ body.overflow-hidden { overflow: hidden; } -.root { - isolation: isolate; -} - /* From Tailwind */ .sr-only { position: absolute; @@ -84,12 +73,6 @@ body.overflow-hidden { border-width: 0; } -ul { - padding-inline-start: 0; - margin-block-start: 0; - margin-block-end: 0; -} - @media screen and (min-width: 768px) { :root { --max-width-single-spacing: var(--Layout-Tablet-Margin-Margin-min); diff --git a/apps/scandic-web/app/[lang]/(live)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/layout.tsx index 02b2b5fbc..6e2aff631 100644 --- a/apps/scandic-web/app/[lang]/(live)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live)/layout.tsx @@ -1,4 +1,5 @@ import "@scandic-hotels/design-system/fonts.css" +import "@scandic-hotels/design-system/normalize.css" import "@/app/globals.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css" import "@scandic-hotels/design-system/style.css" diff --git a/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx b/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx index fbc138f23..1129a1112 100644 --- a/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx @@ -1,4 +1,5 @@ import "@scandic-hotels/design-system/fonts.css" +import "@scandic-hotels/design-system/normalize.css" import "@/app/globals.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css" import "@scandic-hotels/design-system/style.css" diff --git a/apps/scandic-web/app/[lang]/(partner)/layout.tsx b/apps/scandic-web/app/[lang]/(partner)/layout.tsx index 050dd4eae..7ea3e0b89 100644 --- a/apps/scandic-web/app/[lang]/(partner)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(partner)/layout.tsx @@ -1,4 +1,5 @@ import "@scandic-hotels/design-system/fonts.css" +import "@scandic-hotels/design-system/normalize.css" import "@/app/globals.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css" import "@scandic-hotels/design-system/style.css" diff --git a/apps/scandic-web/app/[lang]/webview/layout.tsx b/apps/scandic-web/app/[lang]/webview/layout.tsx index dc7b8ec7a..c45097808 100644 --- a/apps/scandic-web/app/[lang]/webview/layout.tsx +++ b/apps/scandic-web/app/[lang]/webview/layout.tsx @@ -1,4 +1,5 @@ import "@scandic-hotels/design-system/fonts.css" +import "@scandic-hotels/design-system/normalize.css" import "@/app/globals.css" import "@scandic-hotels/design-system/style.css" import "@scandic-hotels/design-system/design-system-new-deprecated.css" diff --git a/apps/scandic-web/app/globals.css b/apps/scandic-web/app/globals.css index 72e6af58e..494728be1 100644 --- a/apps/scandic-web/app/globals.css +++ b/apps/scandic-web/app/globals.css @@ -43,15 +43,8 @@ } } -* { - margin: 0; - box-sizing: border-box; -} - html, body { - margin: 0; - padding: 0; scroll-behavior: smooth; } @@ -67,10 +60,6 @@ body.overflow-hidden { overflow: hidden; } -.root { - isolation: isolate; -} - /* From Tailwind */ .sr-only { position: absolute; @@ -84,12 +73,6 @@ body.overflow-hidden { border-width: 0; } -ul { - padding-inline-start: 0; - margin-block-start: 0; - margin-block-end: 0; -} - @media screen and (min-width: 768px) { :root { --max-width-single-spacing: var(--Layout-Tablet-Margin-Margin-min); diff --git a/packages/design-system/.storybook/preview.tsx b/packages/design-system/.storybook/preview.tsx index ea5ca867d..9e32e3ffe 100644 --- a/packages/design-system/.storybook/preview.tsx +++ b/packages/design-system/.storybook/preview.tsx @@ -4,6 +4,7 @@ import type { Preview, ReactRenderer } from '@storybook/nextjs-vite' import { reactIntl } from './reactIntl' import '../lib/fonts.css' +import '../lib/normalize.css' import '../lib/style.css' import '../lib/design-system-new-deprecated.css' diff --git a/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/hotelCardDialogImage.module.css b/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/hotelCardDialogImage.module.css index 711ab7fda..603b574d8 100644 --- a/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/hotelCardDialogImage.module.css +++ b/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/hotelCardDialogImage.module.css @@ -32,15 +32,3 @@ .imageContainer img { object-fit: cover; } - -.imageContainer .tripAdvisor { - position: absolute; - left: 7px; - top: 7px; - border-radius: 2px; -} - -.imageContainer.top .tripAdvisor { - left: 4px; - top: 4px; -} diff --git a/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/index.tsx b/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/index.tsx index 0efe5da68..e84ed04e5 100644 --- a/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/index.tsx +++ b/packages/design-system/lib/components/HotelCard/HotelCardDialogImage/index.tsx @@ -1,9 +1,7 @@ -import TripadvisorIcon from '@scandic-hotels/design-system/Icons/TripadvisorIcon' import Image from '@scandic-hotels/design-system/Image' -import Chip from '@scandic-hotels/design-system/Chip' - import { hotelCardDialogImageVariants } from './variants' +import { TripAdvisorChip } from '@scandic-hotels/design-system/TripAdvisorChip' import styles from './hotelCardDialogImage.module.css' @@ -39,12 +37,10 @@ export function HotelCardDialogImage({ /> )} {rating?.tripAdvisor && ( -
{rating}
+