Skip to content

Commit

Permalink
[cascading] from release/10.3.0-rc to main (#1763)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/10.3.0-rc","targetBranch":"main","bypassReviewers":true,"isConflicting":false}
-->

## Cascading from release/10.3.0-rc to main

The configuration requests the cascading to bypass reviewer in case of
CI success.
To not bypass the reviewing process, please check the following
checkbox:

- [ ] <!-- !cancel bypass! --> 🚫 stop reviewing process
bypass for this Pull Request

---

<small>This Pull Request has been generated with ❤️ by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
mrednic-1A committed May 7, 2024
2 parents bc7ce48 + eebbc19 commit c382fd5
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions packages/@o3r/styling/scss/theming/otter-theme/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,14 @@
/// @param {bool} $is-dark-theme
/// @param {map} $application [()] a set of properties to override for one specific implementation
/// @return {map} containing the palette maps and the otter-theme variables map
@function generate-otter-theme($primary: mat-functions.define-palette(amadeus-palette.$ama-primary), $highlight: mat-functions.define-palette(amadeus-palette.$ama-highlight), $accent: mat-functions.define-palette(amadeus-palette.$ama-accent), $warn: mat-functions.define-palette(amadeus-palette.$ama-warn), $is-dark-theme: false, $application: ()) {
@function generate-otter-theme(
$primary: map.get(mat-functions.define-palette(amadeus-palette.$ama-primary), 'value'),
$highlight: map.get(mat-functions.define-palette(amadeus-palette.$ama-highlight), 'value'),
$accent: map.get(mat-functions.define-palette(amadeus-palette.$ama-accent), 'value'),
$warn: map.get(mat-functions.define-palette(amadeus-palette.$ama-warn), 'value'),
$is-dark-theme: false,
$application: ()
) {
$theme: mat-functions.generate-theme(
$primary: $primary,
$highlight: $highlight,
Expand All @@ -164,7 +171,13 @@
/// @param {map} $warn [$otter-warn] palette generated via mat-functions.define-palette with the colors used in warning or error feedbacks
/// @param {map} $application [()] a set of properties to override for one specific implementation
/// @return {map} containing the palette maps and the otter-theme variables map
@function generate-otter-dark-theme($primary: mat-functions.define-palette(amadeus-palette.$ama-primary), $highlight: mat-functions.define-palette(amadeus-palette.$ama-highlight), $accent: mat-functions.define-palette(amadeus-palette.$ama-accent), $warn: mat-functions.define-palette(amadeus-palette.$ama-warn), $application: ()) {
@function generate-otter-dark-theme(
$primary: map.get(mat-functions.define-palette(amadeus-palette.$ama-primary), 'value'),
$highlight: map.get(mat-functions.define-palette(amadeus-palette.$ama-highlight), 'value'),
$accent: map.get(mat-functions.define-palette(amadeus-palette.$ama-accent), 'value'),
$warn: map.get(mat-functions.define-palette(amadeus-palette.$ama-warn), 'value'),
$application: ()
) {
@return generate-otter-theme(
$primary: $primary,
$highlight: $highlight,
Expand Down

0 comments on commit c382fd5

Please sign in to comment.