diff --git a/apps/daffio/src/app/content/home/components/home-callout-platforms/home-callout-platforms.module.ts b/apps/daffio/src/app/content/home/components/home-callout-platforms/home-callout-platforms.module.ts index da138734e3..c8251f4cf4 100644 --- a/apps/daffio/src/app/content/home/components/home-callout-platforms/home-callout-platforms.module.ts +++ b/apps/daffio/src/app/content/home/components/home-callout-platforms/home-callout-platforms.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { DaffCalloutModule } from '@daffodil/design'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffImageModule } from '@daffodil/design/image'; diff --git a/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts b/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts index 5c2f7d3a40..9a3593f252 100644 --- a/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts +++ b/apps/daffio/src/app/content/home/components/home-callout-pwa/home-callout-pwa.module.ts @@ -2,11 +2,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { - DaffCalloutModule, - DaffCardModule, -} from '@daffodil/design'; +import { DaffCardModule } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffImageModule } from '@daffodil/design/image'; diff --git a/apps/daffio/src/app/content/why-pwa/components/why-pwa-examples/why-pwa-examples.module.ts b/apps/daffio/src/app/content/why-pwa/components/why-pwa-examples/why-pwa-examples.module.ts index 5e05c63d48..f235f0a035 100644 --- a/apps/daffio/src/app/content/why-pwa/components/why-pwa-examples/why-pwa-examples.module.ts +++ b/apps/daffio/src/app/content/why-pwa/components/why-pwa-examples/why-pwa-examples.module.ts @@ -2,10 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { - DaffCalloutModule, - DaffCardModule, -} from '@daffodil/design'; +import { DaffCardModule } from '@daffodil/design'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffioWhyPwaExamplesComponent } from './why-pwa-examples.component'; diff --git a/apps/daffio/src/app/content/why-pwa/components/why-pwa-overview/why-pwa-overview.module.ts b/apps/daffio/src/app/content/why-pwa/components/why-pwa-overview/why-pwa-overview.module.ts index 34e69cff67..5053ff11fa 100644 --- a/apps/daffio/src/app/content/why-pwa/components/why-pwa-overview/why-pwa-overview.module.ts +++ b/apps/daffio/src/app/content/why-pwa/components/why-pwa-overview/why-pwa-overview.module.ts @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffCalloutModule, - DaffCardModule, -} from '@daffodil/design'; +import { DaffCardModule } from '@daffodil/design'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffioWhyPwaOverviewComponent } from './why-pwa-overview.component'; diff --git a/apps/daffio/src/app/content/why-pwa/components/why-pwa-solution/why-pwa-solution.module.ts b/apps/daffio/src/app/content/why-pwa/components/why-pwa-solution/why-pwa-solution.module.ts index 677678ae3c..a5794e4950 100644 --- a/apps/daffio/src/app/content/why-pwa/components/why-pwa-solution/why-pwa-solution.module.ts +++ b/apps/daffio/src/app/content/why-pwa/components/why-pwa-solution/why-pwa-solution.module.ts @@ -2,10 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { - DaffCalloutModule, - DaffListModule, -} from '@daffodil/design'; +import { DaffListModule } from '@daffodil/design'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffioWhyPwaSolutionComponent } from './why-pwa-solution.component'; diff --git a/apps/daffio/src/app/content/why-pwa/components/why-pwa-stats/why-pwa-stats.module.ts b/apps/daffio/src/app/content/why-pwa/components/why-pwa-stats/why-pwa-stats.module.ts index e96b0226c5..e8269e2e70 100644 --- a/apps/daffio/src/app/content/why-pwa/components/why-pwa-stats/why-pwa-stats.module.ts +++ b/apps/daffio/src/app/content/why-pwa/components/why-pwa-stats/why-pwa-stats.module.ts @@ -3,10 +3,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { - DaffCalloutModule, - DaffCardModule, -} from '@daffodil/design'; +import { DaffCardModule } from '@daffodil/design'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffioWhyPwaStatsComponent } from './why-pwa-stats.component'; diff --git a/apps/daffio/src/app/core/footer/footer.module.ts b/apps/daffio/src/app/core/footer/footer.module.ts index ec935ac831..c3f0be5ce0 100644 --- a/apps/daffio/src/app/core/footer/footer.module.ts +++ b/apps/daffio/src/app/core/footer/footer.module.ts @@ -8,12 +8,12 @@ import { DaffCopyrightModule, } from '@daffodil/branding'; import { - DaffCalloutModule, DaffListModule, DaffButtonSetModule, DaffInputModule, } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { DaffioSimpleFooterComponent } from './simple-footer/simple-footer.component'; diff --git a/libs/design/src/molecules/callout/README.md b/libs/design/callout/README.md similarity index 100% rename from libs/design/src/molecules/callout/README.md rename to libs/design/callout/README.md diff --git a/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts b/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts index 4b107a1748..02a9de2b03 100644 --- a/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts +++ b/libs/design/callout/examples/src/callout-text-alignment/callout-text-alignment.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffCalloutModule } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { CalloutTextAlignmentComponent } from './callout-text-alignment.component'; diff --git a/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts b/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts index dc8d9e654c..1c013d82f4 100644 --- a/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts +++ b/libs/design/callout/examples/src/callout-theming/callout-theming.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffCalloutModule } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { CalloutThemingComponent } from './callout-theming.component'; diff --git a/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts b/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts index 074d1c6622..3321488d03 100644 --- a/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts +++ b/libs/design/callout/examples/src/callout-with-grid/callout-with-grid.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffCalloutModule } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { CalloutWithGridComponent } from './callout-with-grid.component'; diff --git a/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts b/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts index a0a8f6578c..63dd68c7de 100644 --- a/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts +++ b/libs/design/callout/examples/src/compact-callout/compact-callout.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { DaffCalloutModule } from '@daffodil/design'; import { DaffButtonModule } from '@daffodil/design/button'; +import { DaffCalloutModule } from '@daffodil/design/callout'; import { DaffContainerModule } from '@daffodil/design/container'; import { CompactCalloutComponent } from './compact-callout.component'; diff --git a/libs/design/callout/ng-package.json b/libs/design/callout/ng-package.json new file mode 100644 index 0000000000..1293689a4f --- /dev/null +++ b/libs/design/callout/ng-package.json @@ -0,0 +1,9 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../dist/design/callout", + "deleteDestPath": false, + "lib": { + "entryFile": "src/index.ts", + "styleIncludePaths": ["../src/scss"] + } +} \ No newline at end of file diff --git a/libs/design/src/molecules/callout/callout-body/callout-body.directive.spec.ts b/libs/design/callout/src/callout-body/callout-body.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-body/callout-body.directive.spec.ts rename to libs/design/callout/src/callout-body/callout-body.directive.spec.ts diff --git a/libs/design/src/molecules/callout/callout-body/callout-body.directive.ts b/libs/design/callout/src/callout-body/callout-body.directive.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-body/callout-body.directive.ts rename to libs/design/callout/src/callout-body/callout-body.directive.ts diff --git a/libs/design/src/molecules/callout/callout-icon/callout-icon.directive.spec.ts b/libs/design/callout/src/callout-icon/callout-icon.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-icon/callout-icon.directive.spec.ts rename to libs/design/callout/src/callout-icon/callout-icon.directive.spec.ts diff --git a/libs/design/src/molecules/callout/callout-icon/callout-icon.directive.ts b/libs/design/callout/src/callout-icon/callout-icon.directive.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-icon/callout-icon.directive.ts rename to libs/design/callout/src/callout-icon/callout-icon.directive.ts diff --git a/libs/design/src/molecules/callout/callout-subtitle/callout-subtitle.directive.spec.ts b/libs/design/callout/src/callout-subtitle/callout-subtitle.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-subtitle/callout-subtitle.directive.spec.ts rename to libs/design/callout/src/callout-subtitle/callout-subtitle.directive.spec.ts diff --git a/libs/design/src/molecules/callout/callout-subtitle/callout-subtitle.directive.ts b/libs/design/callout/src/callout-subtitle/callout-subtitle.directive.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-subtitle/callout-subtitle.directive.ts rename to libs/design/callout/src/callout-subtitle/callout-subtitle.directive.ts diff --git a/libs/design/src/molecules/callout/callout-tagline/callout-tagline.directive.spec.ts b/libs/design/callout/src/callout-tagline/callout-tagline.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-tagline/callout-tagline.directive.spec.ts rename to libs/design/callout/src/callout-tagline/callout-tagline.directive.spec.ts diff --git a/libs/design/src/molecules/callout/callout-tagline/callout-tagline.directive.ts b/libs/design/callout/src/callout-tagline/callout-tagline.directive.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-tagline/callout-tagline.directive.ts rename to libs/design/callout/src/callout-tagline/callout-tagline.directive.ts diff --git a/libs/design/src/molecules/callout/callout-theme.scss b/libs/design/callout/src/callout-theme.scss similarity index 95% rename from libs/design/src/molecules/callout/callout-theme.scss rename to libs/design/callout/src/callout-theme.scss index 99ff500aa8..3f9ef61488 100644 --- a/libs/design/src/molecules/callout/callout-theme.scss +++ b/libs/design/callout/src/callout-theme.scss @@ -1,6 +1,6 @@ @use 'sass:map'; -@use '../../../scss/core'; -@use '../../../scss/theming'; +@use '../../scss/core'; +@use '../../scss/theming'; @mixin daff-callout-theme-variant($color) { background: $color; diff --git a/libs/design/src/molecules/callout/callout-title/callout-title.directive.spec.ts b/libs/design/callout/src/callout-title/callout-title.directive.spec.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-title/callout-title.directive.spec.ts rename to libs/design/callout/src/callout-title/callout-title.directive.spec.ts diff --git a/libs/design/src/molecules/callout/callout-title/callout-title.directive.ts b/libs/design/callout/src/callout-title/callout-title.directive.ts similarity index 100% rename from libs/design/src/molecules/callout/callout-title/callout-title.directive.ts rename to libs/design/callout/src/callout-title/callout-title.directive.ts diff --git a/libs/design/src/molecules/callout/callout.module.ts b/libs/design/callout/src/callout.module.ts similarity index 100% rename from libs/design/src/molecules/callout/callout.module.ts rename to libs/design/callout/src/callout.module.ts diff --git a/libs/design/src/molecules/callout/callout/callout.component.scss b/libs/design/callout/src/callout/callout.component.scss similarity index 96% rename from libs/design/src/molecules/callout/callout/callout.component.scss rename to libs/design/callout/src/callout/callout.component.scss index c29e1d6c53..586e03053f 100644 --- a/libs/design/src/molecules/callout/callout/callout.component.scss +++ b/libs/design/callout/src/callout/callout.component.scss @@ -1,5 +1,5 @@ -@use '../../../../scss/typography' as t; -@use '../../../../scss/layout'; +@use '../../../scss/typography' as t; +@use '../../../scss/layout'; .daff-callout { $root: &; diff --git a/libs/design/src/molecules/callout/callout/callout.component.spec.ts b/libs/design/callout/src/callout/callout.component.spec.ts similarity index 96% rename from libs/design/src/molecules/callout/callout/callout.component.spec.ts rename to libs/design/callout/src/callout/callout.component.spec.ts index 85b18c1ff1..4393eab69b 100644 --- a/libs/design/src/molecules/callout/callout/callout.component.spec.ts +++ b/libs/design/callout/src/callout/callout.component.spec.ts @@ -9,13 +9,16 @@ import { } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { + DaffPalette, + DaffTextAlignment, +} from '@daffodil/design'; + import { DaffCalloutComponent, DaffCalloutLayout, DaffCalloutSize, } from './callout.component'; -import { DaffPalette } from '../../../core/colorable/public_api'; -import { DaffTextAlignment } from '../../../core/text-alignable/text-alignable'; @Component ({ template: ` diff --git a/libs/design/src/molecules/callout/callout/callout.component.ts b/libs/design/callout/src/callout/callout.component.ts similarity index 83% rename from libs/design/src/molecules/callout/callout/callout.component.ts rename to libs/design/callout/src/callout/callout.component.ts index 69450d4bc7..4c741fe9d4 100644 --- a/libs/design/src/molecules/callout/callout/callout.component.ts +++ b/libs/design/callout/src/callout/callout.component.ts @@ -8,18 +8,16 @@ import { Renderer2, } from '@angular/core'; -import { daffArticleEncapsulatedMixin } from '../../../core/article-encapsulated/public_api'; import { + daffArticleEncapsulatedMixin, DaffColorable, daffColorMixin, -} from '../../../core/colorable/public_api'; -import { DaffCompactable, daffCompactableMixin, -} from '../../../core/compactable/public_api'; -import { daffManageContainerLayoutMixin } from '../../../core/manage-container-layout/public_api'; -import { DaffTextAlignable } from '../../../core/text-alignable/text-alignable'; -import { daffTextAlignmentMixin } from '../../../core/text-alignable/text-alignable-mixin'; + daffManageContainerLayoutMixin, + DaffTextAlignable, + daffTextAlignmentMixin, +} from '@daffodil/design'; /** * @deprecated See {@link DaffTextAlignable} diff --git a/libs/design/callout/src/index.ts b/libs/design/callout/src/index.ts new file mode 100644 index 0000000000..4aaf8f92ed --- /dev/null +++ b/libs/design/callout/src/index.ts @@ -0,0 +1 @@ +export * from './public_api'; diff --git a/libs/design/src/molecules/callout/public_api.ts b/libs/design/callout/src/public_api.ts similarity index 100% rename from libs/design/src/molecules/callout/public_api.ts rename to libs/design/callout/src/public_api.ts diff --git a/libs/design/scss/theme.scss b/libs/design/scss/theme.scss index ac7cb801ed..5c70366e2d 100644 --- a/libs/design/scss/theme.scss +++ b/libs/design/scss/theme.scss @@ -27,7 +27,7 @@ @use '../loading-icon/src/loading-icon-theme' as loading-icon; @use '../src/atoms/progress-indicator/progress-indicator-theme' as progress-indicator; @use '../accordion/src/accordion-theme' as accordion; -@use '../src/molecules/callout/callout-theme' as callout; +@use '../callout/src/callout-theme' as callout; @use '../src/molecules/card/card/card-theme' as card; @use '../src/molecules/hero/hero-theme' as hero; @use '../src/molecules/list/list/list-theme' as list; diff --git a/libs/design/src/public_api.ts b/libs/design/src/public_api.ts index ad9b75e6a0..34852d1374 100644 --- a/libs/design/src/public_api.ts +++ b/libs/design/src/public_api.ts @@ -29,7 +29,6 @@ export * from './molecules/paginator/public_api'; export * from './molecules/qty-dropdown/public_api'; export * from './molecules/sidebar/public_api'; export * from './molecules/hero/public_api'; -export * from './molecules/callout/public_api'; export * from './molecules/feature/public_api'; export * from './molecules/card/public_api';