diff --git a/apps/isa-app/project.json b/apps/isa-app/project.json index 311d00cb4..a3ef5c733 100644 --- a/apps/isa-app/project.json +++ b/apps/isa-app/project.json @@ -39,7 +39,6 @@ "styles": [ "@angular/cdk/overlay-prebuilt.css", "apps/isa-app/src/tailwind.scss", - "apps/isa-app/src/ui.scss", "apps/isa-app/src/styles.scss" ], "scripts": [] @@ -129,7 +128,6 @@ ], "styles": [ "@angular/cdk/overlay-prebuilt.css", - "apps/isa-app/src/ui.scss", "apps/isa-app/src/tailwind.scss", "apps/isa-app/src/styles.scss" ] @@ -150,7 +148,6 @@ "compodoc": false, "styles": [ "@angular/cdk/overlay-prebuilt.css", - "apps/isa-app/src/ui.scss", "apps/isa-app/src/tailwind.scss", "apps/isa-app/src/styles.scss" ] diff --git a/apps/isa-app/src/tailwind.scss b/apps/isa-app/src/tailwind.scss index 61744eb7f..9e107da5b 100644 --- a/apps/isa-app/src/tailwind.scss +++ b/apps/isa-app/src/tailwind.scss @@ -1,13 +1,23 @@ -@use './scss/components'; -@use './scss/root'; -@use './scss/customer'; -@use './scss/branch'; +@use "./scss/components"; +@use "./scss/root"; +@use "./scss/customer"; +@use "./scss/branch"; @tailwind base; @tailwind components; @tailwind utilities; @layer components { + @import "../../../libs/ui/buttons/src/buttons.scss"; + @import "../../../libs/ui/datepicker/src/datepicker.scss"; + @import "../../../libs/ui/dialog/src/dialog.scss"; + @import "../../../libs/ui/input-controls/src/input-controls.scss"; + @import "../../../libs/ui/menu/src/menu.scss"; + @import "../../../libs/ui/progress-bar/src/lib/progress-bar.scss"; + @import "../../../libs/ui/search-bar/src/search-bar.scss"; + @import "../../../libs/ui/skeleton-loader/src/skeleton-loader.scss"; + @import "../../../libs/ui/tooltip/src/tooltip.scss"; + .input-control { @apply rounded border border-solid border-[#AEB7C1] px-4 py-[1.125rem] outline-none; } diff --git a/apps/isa-app/src/ui.scss b/apps/isa-app/src/ui.scss deleted file mode 100644 index 532f8389b..000000000 --- a/apps/isa-app/src/ui.scss +++ /dev/null @@ -1,9 +0,0 @@ -@use "../../../libs/ui/buttons/src/buttons.scss"; -@use "../../../libs/ui/datepicker/src/datepicker.scss"; -@use "../../../libs/ui/dialog/src/dialog.scss"; -@use "../../../libs/ui/input-controls/src/input-controls.scss"; -@use "../../../libs/ui/menu/src/menu.scss"; -@use "../../../libs/ui/progress-bar/src/lib/progress-bar.scss"; -@use "../../../libs/ui/search-bar/src/search-bar.scss"; -@use "../../../libs/ui/skeleton-loader/src/skeleton-loader.scss"; -@use "../../../libs/ui/tooltip/src/tooltip.scss"; diff --git a/tailwind.config.js b/tailwind.config.js index 49d614eae..27e90a4ba 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -2,7 +2,7 @@ const plugin = require('tailwindcss/plugin'); /** @type {import('tailwindcss').Config} */ module.exports = { - content: ['./apps/**/*.{html,ts}', './libs/**/*.{html,ts}'], + content: ['./apps/**/*.{html,ts}', './libs/**/*.{html,ts}', './libs/**/*.scss'], darkMode: 'media', // or 'media' or 'class', theme: { screens: {