Skip to content

build(branding): revise scss export format #4639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damienwebdev merged 1 commit into from
Aug 7, 2026
Merged

build(branding): revise scss export format #4639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
"includePaths": [
"apps/daffio/src/scss",
"dist/design/scss",
"dist/branding/src/scss",
"dist/docs/src/scss"
]
},
Expand Down Expand Up @@ -368,7 +367,6 @@
"includePaths": [
"apps/daffio/src/scss",
"dist/design/scss",
"dist/branding/src/scss",
"dist/docs/src/scss"
]
},
Expand Down
2 changes: 1 addition & 1 deletion apps/daffio/src/scss/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 10 additions & 2 deletions libs/branding/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion ...randing/src/scss/daff-branding-theme.scss → libs/branding/scss/component-themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 1 addition & 2 deletions libs/branding/src/scss/branding-theme.scss → libs/branding/scss/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 1 addition & 2 deletions libs/branding/src/lib/logo/logo-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Loading