EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4530 chore: Fix branded bbb icon on 4.0 icon version

main
Pau Ferrer Ocaña 2024-03-12 13:16:01 +01:00
parent 2261dfb296
commit 7252e70720
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/components/mod-icon/mod-icon.scss
View File

@ -40,7 +40,7 @@
--color: white; --color: white;
@each $type, $value in $activity-icon-background-colors { @each $type, $value in $activity-icon-background-colors {
&.#{$type} { &.#{$type}:not(.branded) {
background-color: var(--activity-40-#{$type}); background-color: var(--activity-40-#{$type});
} }
} }

12
src/core/components/mod-icon/mod-icon.ts
View File

@ -127,6 +127,14 @@ export class CoreModIconComponent implements OnInit, OnChanges {
// No icon or local icon (not legacy), colorize it. // No icon or local icon (not legacy), colorize it.
if (!this.iconUrl || this.isLocalUrl) { if (!this.iconUrl || this.isLocalUrl) {
// Exception for bigbluebuttonbn, it's the only one that has a branded icon.
if (this.iconVersion === IconVersion.VERSION_4_0 && this.modname === 'bigbluebuttonbn') {
this.isBranded = true;
return;
}
this.isBranded = false; this.isBranded = false;
return; return;
@ -136,8 +144,8 @@ export class CoreModIconComponent implements OnInit, OnChanges {
// If it's an Moodle Theme icon, check if filtericon is set and use it. // If it's an Moodle Theme icon, check if filtericon is set and use it.
if (this.iconUrl && CoreUrlUtils.isThemeImageUrl(this.iconUrl)) { if (this.iconUrl && CoreUrlUtils.isThemeImageUrl(this.iconUrl)) {
const iconParams = CoreUrlUtils.extractUrlParams(this.iconUrl); const filter = CoreUrlUtils.getThemeImageUrlParam(this.iconUrl, 'filtericon');
if (iconParams['filtericon'] === '1') { if (filter === '1') {
this.isBranded = false; this.isBranded = false;
return; return;