Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Modal manager redwood styling #1994

Merged
merged 8 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"overrides": [
{
"files": ["packages/terra-theme-properties/**/*.scss"],
"files": ["packages/terra-theme-properties/**/*.scss", "packages/**/redwood-theme/*.scss"],
Copy link
Contributor

@cm9361 cm9361 Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you want "...redwood-theme/**/*.scss"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, fixed in dcf6be0

"rules": {
"terra/custom-property-name": false,
"terra/custom-property-namespace": false
Expand Down Expand Up @@ -137,7 +137,7 @@
"regenerator-runtime": "^0.13.2",
"stylelint": "^15.0.0",
"terra-aggregate-translations": "^1.0.0",
"terra-application": "^1.48.0",
"terra-application": "^1.57.0",
"terra-disclosure-manager": "^4.9.0",
"terra-enzyme-intl": "^3.4.0",
"terra-icon": "^3.58.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/terra-modal-manager/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Added
* Redwood theme styling.

## 6.69.0 - (December 18, 2023)

* Changed
Expand Down
1 change: 1 addition & 0 deletions packages/terra-modal-manager/src/ModalManager.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Themes
@import './clinical-lowlight-theme/ModalManager.module';
@import './orion-fusion-theme/ModalManager.module';
@import './redwood-theme/ModalManager.module';

:local {
.container {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
:local {
.redwood-theme {
--terra-modal-manager-background-color: var(--modal-background-color);
--terra-modal-manager-border: none;
--terra-modal-manager-border-radius: var(--modal-border-radius);
--terra-modal-manager-box-shadow: var(--modal-box-shadow);
--terra-modal-manager-foreground-color: inherit;
}
}
3 changes: 2 additions & 1 deletion packages/terra-theme-properties/src/scss/semantic-names.scss
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,14 @@

// =======================================
// terra-modal-manager
// https://github.com/cerner/terra-core/tree/main/packages/terra-modal-manager
// https://github.com/cerner/terra-framework/tree/main/packages/terra-modal-manager
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These files are generated. I communicated this issue with the UX team. You don't want to manually update it as it would just be incorrect the next release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thank you so much for taking care of that, reverted in dcf6be0

// https://jira2.cerner.com/browse/UXPLATFORM-10006
// =======================================
.redwood-theme {
--modal-background-color: var(--container-style-1-background-color);
--modal-box-shadow: var(--rds-box-shadow-md);
--modal-border-radius: var(--rds-border-radius-md);
// TODO add --modal-foreground-color variable or remove this line is inherit color works
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still think we don't want a UX theme variable here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed here: dcf6be0

}

// =======================================
Expand Down
2 changes: 1 addition & 1 deletion terra-theme.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const themeConfig = {
scoped: ['clinical-lowlight-theme', 'orion-fusion-theme'],
scoped: ['clinical-lowlight-theme', 'orion-fusion-theme', 'redwood-theme'],
density: 'comfortable',
};

Expand Down
Loading