inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

AAE-31712 Custom theme fix after ng17 update (#10661)

Browse Source 
* AAE-31712 Fix custom theme after Angular17 update

* update
This commit is contained in:
Bartosz Sekula 2025-02-18 13:58:29 +01:00 committed by GitHub
parent ca4dcf85f4
commit 3c7e8e84ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/custom-theme/material-theme.scss
View File

@ -1,7 +1,8 @@
@use 'sass:map'; @use 'sass:map';
@use '@angular/material' as mat;
@import './theme/theme-data'; @import './theme/theme-data';
$custom-theme: mat-light-theme( $custom-theme: mat.define-light-theme(
( (
color: ( color: (
primary: map.get($palettes, primary), primary: map.get($palettes, primary),

8
lib/core/custom-theme/theme/custom-palette-creator.scss
View File

@ -1,6 +1,7 @@
@use 'sass:map'; @use 'sass:map';
@use 'sass:math'; @use 'sass:math';
@use 'sass:color'; @use 'sass:color';
@use '@angular/material' as mat;
@function multiply($fore, $back) { @function multiply($fore, $back) {
$red: math.div(color.red($back) * color.red($fore), 255); $red: math.div(color.red($back) * color.red($fore), 255);
@ -44,8 +45,11 @@
$green: color.green($color); $green: color.green($color);
$blue: color.blue($color); $blue: color.blue($color);
$light-text: $light-primary-text; $light-text: map.get(mat.$light-theme-foreground-palette, text);
$dark-text: $dark-primary-text; $light-secondary-text: map.get(mat.$light-theme-foreground-palette, secondary-text);
$dark-text: map.get(mat.$dark-theme-foreground-palette, text);
$dark-secondary-text: map.get(mat.$dark-theme-foreground-palette, secondary-text);
@if $colorType == 'accent' { @if $colorType == 'accent' {
$light-text: $light-secondary-text; $light-text: $light-secondary-text;

6
lib/core/custom-theme/theme/theme-data.scss
View File

@ -1,5 +1,4 @@
@use 'sass:map'; @use 'sass:map';
@import '@angular/material/theming';
@import './theme-configuration'; @import './theme-configuration';
@import './typography'; @import './typography';
@import './custom-theme-palettes'; @import './custom-theme-palettes';
@ -14,9 +13,6 @@ $text-color: map.get($theme-config, 'textColor');
$base-font-size: map.get($theme-config, 'baseFontSize'); $base-font-size: map.get($theme-config, 'baseFontSize');
$font-family: map.get($theme-config, 'fontFamily'); $font-family: map.get($theme-config, 'fontFamily');
$app-typography: get-mat-typography( $app-typography: get-mat-typography($base-font-size, $font-family);
$base-font-size,
$font-family
);
$palettes: get-mat-palettes($primary-color, $accent-color); $palettes: get-mat-palettes($primary-color, $accent-color);