diff --git a/angular.json b/angular.json index baacf398b5..ecdf4d2e44 100644 --- a/angular.json +++ b/angular.json @@ -252,7 +252,6 @@ "includePaths": [ "apps/daffio/src/scss", "dist/design/scss", - "dist/branding/src/scss", "dist/docs/src/scss" ] }, @@ -368,7 +367,6 @@ "includePaths": [ "apps/daffio/src/scss", "dist/design/scss", - "dist/branding/src/scss", "dist/docs/src/scss" ] }, diff --git a/apps/daffio/src/scss/styles.scss b/apps/daffio/src/scss/styles.scss index bdde54a2d0..afa626ab5e 100644 --- a/apps/daffio/src/scss/styles.scss +++ b/apps/daffio/src/scss/styles.scss @@ -6,7 +6,7 @@ @use './component-themes' as daffio-components; // @daffodil/branding -@use 'daff-branding-theme' as branding; +@use '@daffodil/branding/scss/component-themes' as branding; // @daffodil/docs @use 'daff-docs-theme' as docs; diff --git a/libs/branding/package.json b/libs/branding/package.json index a74a38020d..e584b66659 100644 --- a/libs/branding/package.json +++ b/libs/branding/package.json @@ -26,5 +26,13 @@ "devDependencies": { "@daffodil/design": "0.0.0-PLACEHOLDER" }, - "description": "Reusable branding components including copyright, logos, and theming assets. Part of the Daffodil ecommerce framework." -} + "description": "Reusable branding components including copyright, logos, and theming assets. Part of the Daffodil ecommerce framework.", + "exports": { + "./scss/theme": { + "sass": "./scss/theme.scss" + }, + "./scss/component-themes": { + "sass": "./scss/component-themes.scss" + } + } +} \ No newline at end of file diff --git a/libs/branding/src/scss/daff-branding-theme.scss b/libs/branding/scss/component-themes.scss similarity index 65% rename from libs/branding/src/scss/daff-branding-theme.scss rename to libs/branding/scss/component-themes.scss index 3c48154a1a..ff69b63792 100644 --- a/libs/branding/src/scss/daff-branding-theme.scss +++ b/libs/branding/scss/component-themes.scss @@ -1,4 +1,4 @@ -@use '../lib/logo/logo-theme' as logo; +@use '../src/lib/logo/logo-theme' as logo; @mixin daff-branding-theme($theme) { @include logo.daff-logo-theme($theme); diff --git a/libs/branding/src/scss/branding-theme.scss b/libs/branding/scss/theme.scss similarity index 93% rename from libs/branding/src/scss/branding-theme.scss rename to libs/branding/scss/theme.scss index 73ca890486..90347b7100 100644 --- a/libs/branding/src/scss/branding-theme.scss +++ b/libs/branding/scss/theme.scss @@ -1,5 +1,4 @@ -@use 'theme' as daff-theme; -@forward 'theme'; +@use '@daffodil/design/scss/theme' as daff-theme; $primary: daff-theme.daff-configure-palette(daff-theme.$daff-blue, 60); $secondary: daff-theme.daff-configure-palette(daff-theme.$daff-purple, 60); diff --git a/libs/branding/src/lib/logo/logo-theme.scss b/libs/branding/src/lib/logo/logo-theme.scss index d6326ed562..0af01ed9f8 100644 --- a/libs/branding/src/lib/logo/logo-theme.scss +++ b/libs/branding/src/lib/logo/logo-theme.scss @@ -1,5 +1,4 @@ -@use '../../scss/branding-theme'; -@use 'theme' as daff-theme; +@use '@daffodil/design/scss/theme' as daff-theme; @mixin daff-logo-theme($theme) { $neutral: daff-theme.daff-get-palette($theme, neutral);