[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [FIX][UI] Modules: use a no-box class on nobox=y modules instead of p-2 +...
"luci \(@luciash\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6a1d5f688fda4_38197d64938d4@gitlab-sidekiq-low-urgency-cpu-bound-v2-57bc5b685d-j9lqf.mail> |
luci pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki Commits: dc18dc24 by luci at 2026-06-01T10:24:58+00:00 [FIX][UI] Modules: use a no-box class on nobox=y modules instead of p-2 +... --- * [FIX][UI] Modules: use a no-box class on nobox=y modules instead of p-2 + remove some redundant unnecessary classes from the logo module --- * [FIX][UI] Modules: use a no-box class on nobox=y modules instead of p-2 + remove some redundant unnecessary classes from the logo module to restore its native navbar-brand Bootstrap padding See merge request tikiwiki/tiki!10401 (cherry picked from commit 7a1a4b5dd8fd055cf6fde67be090ea547d961517) 9befe7f7 [FIX][UI] Modules: use a no-box class on nobox=y modules instead of p-2 +... Co-authored-by: luci <gitlab-TfYQc8/[email protected]> See merge request tikiwiki/tiki!10414 - - - - - 3 changed files: - templates/module.tpl - templates/modules/mod-logo.tpl - themes/base_files/scss/_tiki-modules.scss Changes: ===================================== templates/module.tpl ===================================== @@ -76,7 +76,7 @@ class="card-body{if !empty($module_params.class)} {$module_params.class}{/if}"> {else}{* $module_nobox eq 'y' *} <div id="module_{$moduleId}" style="{$module_params.style}{$tpl_module_style}" - class="module{if !empty($module_params.class)} {$module_params.class}{/if} box-{$module_name} p-2"> + class="module{if !empty($module_params.class)} {$module_params.class}{/if} box-{$module_name} no-box"> <div id="mod-{$smarty.capture.name}"> {/if}{* close $module_nobox *} {$module_content} ===================================== templates/modules/mod-logo.tpl ===================================== @@ -1,7 +1,7 @@ {strip} {tikimodule error=$module_params.error title=$tpl_module_title name="logo" flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} <div class="sitelogo" class="d-flex align-items-center"> - <a class="navbar-brand d-flex flex-row w-100 align-self-center align-items-center p-0 {$module_params.class_image|escape}" href="{$module_params.link}" title="{$module_params.title_attr|escape}"> + <a class="navbar-brand" href="{$module_params.link}" title="{$module_params.title_attr|escape}"> {if !empty($module_params.src)} <img class="{$module_params.class_image|escape} sitelogo-img img-fluid align-self-center me-3" src="{$module_params.src}" alt="{$module_params.alt_attr|escape}" {if !empty($module_params.max_height)} style="max-height: {$module_params.max_height}px; width: auto; object-fit: contain;"{/if}> {/if} @@ -17,7 +17,7 @@ {/if} {if $prefs.site_layout neq 'social'}</div></div>{/if} {/if} - </a> + </a> {if $tiki_p_admin eq 'y' and $prefs.sitelogo_upload_icon eq 'y'} <a class="btn btn-link bottom mb-2 position-absolute tips" ===================================== themes/base_files/scss/_tiki-modules.scss ===================================== @@ -1,9 +1,10 @@ // Redundant for .module.card, but needed when nobox=y. -.module { +.module.no-box { position: relative; display: flex !important; flex-direction: column; justify-content: center; + padding: 0 var(--bs-navbar-nav-link-padding-x); } header.container, View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/dc18dc24e3914fc50b225bba207366badd2e8661 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/dc18dc24e3914fc50b225bba207366badd2e8661 You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help _______________________________________________ TikiWiki-cvs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs