From cb7b79d4749369cda59c486ffba9b40d65e2f212 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Mon, 4 Mar 2024 10:55:58 +0100 Subject: [PATCH] OZG-4897 use common tailwind config and root.css --- alfa-client/apps/alfa/src/styles/main.scss | 4 +--- alfa-client/apps/alfa/tailwind.config.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/alfa-client/apps/alfa/src/styles/main.scss b/alfa-client/apps/alfa/src/styles/main.scss index 67fd19f060..ec0d77bb8d 100644 --- a/alfa-client/apps/alfa/src/styles/main.scss +++ b/alfa-client/apps/alfa/src/styles/main.scss @@ -23,9 +23,7 @@ */ @use '@angular/material' as mat; -@tailwind base; -@tailwind components; -@tailwind utilities; +@import 'libs/design-system/src/lib/tailwind-preset/root.css'; @import 'libs/ui/src/lib/font/font_material'; @import 'typeface-roboto/index.css'; diff --git a/alfa-client/apps/alfa/tailwind.config.js b/alfa-client/apps/alfa/tailwind.config.js index 45bd1202e6..ad1344c979 100644 --- a/alfa-client/apps/alfa/tailwind.config.js +++ b/alfa-client/apps/alfa/tailwind.config.js @@ -3,7 +3,7 @@ const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind'); const { join } = require('path'); -const sharedTailwindConfig = require('../../libs/design-system/tailwind.config.js'); +const sharedTailwindConfig = require('../../libs/design-system/src/lib/tailwind-preset/tailwind.config.js'); /** @type {import('tailwindcss').Config} */ module.exports = { -- GitLab