[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Fix module decorations=n parameter by merging duplicate style attributes
"Elifeleti Mukisa Dan \(@Danelif\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <68e8c37650b2f_2c36b69018397@gitlab-sidekiq-low-urgency-cpu-bound-v2-67f7b598f6-6m97h.mail> |
Elifeleti Mukisa Dan pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
f081d3fa by Elifeleti Mukisa Dan at 2025-10-10T08:19:36+00:00
[FIX] Fix module decorations=n parameter by merging duplicate style attributes
---
* [FIX] Fix module decorations=n parameter by merging duplicate style attributes
See merge request tikiwiki/tiki!8743
- - - - -
1 changed file:
- templates/module.tpl
Changes:
=====================================
templates/module.tpl
=====================================
@@ -10,7 +10,7 @@
<div id="module_{$moduleId}"
class="card box-{$module_name} {if $module_decorations eq 'n'}no-decorations{/if} module" {if !empty($tpl_module_style) or $module_decorations eq 'n'}style="{$tpl_module_style} {if $module_decorations eq 'n'}border-color: transparent !important; background: transparent;{/if} "{/if}>
{* {if $module_decorations ne 'n'} *} {* Code updated so module title isn't affected by $module_decorations (actually it already wasn't). *}
- <div class="card-header" {if !empty($module_params.bgcolor)} style="background-color:{$module_params.bgcolor};"{/if} {if $module_decorations eq 'n'}style="border-color: transparent !important; background: transparent !important; padding-bottom: 0 !important;"{/if}>
+ <div class="card-header" {if !empty($module_params.bgcolor) || $module_decorations eq 'n'}style="{if !empty($module_params.bgcolor)}background-color:{$module_params.bgcolor};{/if}{if $module_decorations eq 'n'}border-color: transparent !important; background: transparent !important; padding-bottom: 0 !important;{/if}"{/if}>
{if ($module_notitle ne 'y' && !empty($module_title)) || ($module_flip eq 'y') || $prefs.menus_items_icons eq 'y'}
<h3 class="{if $module_decorations eq 'n'}card-title{else}tiki-card-header-title{/if} h5 mb-0">
{if $module_notitle ne 'y' && !empty($module_title)}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/f081d3fa5fce4d8535b1521ae39c325b71491a77
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/f081d3fa5fce4d8535b1521ae39c325b71491a77
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs