[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite...
"Gary Cunningham-Lee \(--- via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <69106e8ae09d_2c14c3d7b48616b@gitlab-sidekiq-low-urgency-cpu-bound-v2-7d6b66dd6f-kcb6s.mail> |
Gary Cunningham-Lee pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
df88dcee by Gary Cunningham-Lee at 2025-11-09T19:28:15+09:00
[FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite...
---
* [FIX][UI] Replace floats with flexbox to tighten up vertical spacing in the wikitopline area at the top of wiki pages.
* [FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite child themes. Thanks, Marc. Todo: Make these child theme files identical except for color values.
See merge request tikiwiki/tiki!8991
- - - - -
4 changed files:
- templates/layouts/basic/layout_view.tpl
- templates/layouts/classic/layout_view.tpl
- templates/layouts/social/layout_view.tpl
- templates/tiki-wiki_topline.tpl
Changes:
=====================================
templates/layouts/basic/layout_view.tpl
=====================================
@@ -75,7 +75,7 @@
<div class="d-flex w-100 flex-row row flex-wrap gx-4">
<div class="col col1 col-md-12 col-lg-9 {if $prefs.feature_fixed_width neq 'y'}col-xl-10{/if} pb-4" id="col1">
<div id="col1top-outer-wrapper" class="col1top-outer-wrapper d-flex justify-content-between">
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
@@ -120,7 +120,7 @@
</div>
{/if}
</div>
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
@@ -156,7 +156,7 @@
</div>
{/if}
</div>
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
=====================================
templates/layouts/classic/layout_view.tpl
=====================================
@@ -85,7 +85,7 @@
<div class="col col1 col-md-12 col-lg-9 {if $prefs.feature_fixed_width neq 'y'}col-xl-10{/if} pb-4" id="col1">
{if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}
<div id="col1top-outer-wrapper" class="col1top-outer-wrapper d-flex justify-content-between">
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
@@ -132,7 +132,7 @@
</div>
{/if}
</div>
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
@@ -170,7 +170,7 @@
</div>
{/if}
</div>
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
=====================================
templates/layouts/social/layout_view.tpl
=====================================
@@ -105,7 +105,7 @@
{elseif zone_is_empty('left') or $prefs.feature_left_column eq 'n'}
<div class="col col1 col-md-12 col-lg-9 {if $prefs.feature_fixed_width neq 'y'}col-xl-10{/if} pb-4" id="col1">
<div id="col1top-outer-wrapper" class="col1top-outer-wrapper d-flex justify-content-between">
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
@@ -151,7 +151,7 @@
</div>
{/if}
</div>
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
@@ -188,7 +188,7 @@
</div>
{/if}
</div>
- <div class="col1top-inner-wrapper flex-grow-1 mx-2">
+ <div class="col1top-inner-wrapper flex-grow-1 ">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{$modzonepagetop}
{/if}
=====================================
templates/tiki-wiki_topline.tpl
=====================================
@@ -1,13 +1,13 @@
-<div class="wikitopline clearfix">
- <div class="content">
+<div class="wikitopline d-flex justify-content-between w-100">
+ <div class="content mb-2">
{if !isset($hide_page_header) or !$hide_page_header}
- <div class="wikiinfo float-start">
+ <div class="wikiinfo">
{if $prefs.wiki_page_name_above eq 'y' and $print_page ne 'y'}
<a href="tiki-index.php?page={$page|escape:"url"}" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *}
{/if}
{if $prefs.feature_wiki_pageid eq 'y' and $print_page ne 'y'}
- <small><a class="link" href="tiki-index.php?page_id={$page_id}">{tr}page id:{/tr} {$page_id}</a></small>
+ <small><a class="link" href="tiki-index.php?page_id={$page_id}">{tr}Page id:{/tr} {$page_id}</a></small>
{/if}
<div class="description page-description">{breadcrumbs type="desc" loc="page" crumbs=$crumbs}</div>
@@ -18,20 +18,20 @@
{/if}
</div>
{/if} {*hide_page_header*}
- {if $pdf_export eq 'y'}
- <div class="wikiinfo float-start" id="pdfinfo" style="display:none">
- <div class="alert alert-info" style="width:500px"><h4><span class="icon icon-information fas fa-info-circle fa-fw "></span> <span class="rboxtitle">{tr}Please wait{/tr}</span></h4><div class="rboxcontent" style="display: inline"><span class="fas fa-circle-notch fa-spin" style="font-size:24px"></span>{tr} The PDF is being prepared, please wait...{/tr}</div></div>
- </div>
- {/if}
</div> {* div.content *}
-</div> {* div.wikitopline *}
+ {* {if $pdf_export eq 'y'} *}
+ <div class="wikiinfo" id="pdfinfo" style="display:none">
+ <div class="alert alert-info mx-2" style="min-width: 380px;"><h4><span class="icon icon-information fas fa-info-circle fa-fw "></span> <span class="rboxtitle alert-heading">{tr}Please wait{/tr}</span></h4><div class="rboxcontent" style="display: inline"><span class="fas fa-circle-notch fa-spin me-2" style="font-size:24px"></span>{tr}The PDF is being prepared....{/tr}</div></div>
+ </div>
+ {* {/if} *}
+
{if !isset($versioned) and $print_page ne 'y'}
- <div class="wikiactions_wrapper clearfix">
+ {* <div class="wikiactions_wrapper clearfix"> *}
{strip}
{if $show_wiki_actions}
- <div class="wikiactions d-flex justify-content-end mb-2">
- <div class="btn-group ms-2">
+ <div class="wikiactions d-flex justify-content-end mb-2 align-self-end">
+ <div class="btn-group ms-2" style="min-width: 6rem;">
{* Show language dropdown only if there is more than 1 language or user has right to edit *}
{if ($tiki_p_admin eq 'y' or $tiki_p_admin_wiki eq 'y' or $tiki_p_edit eq 'y' or $tiki_p_edit_inline eq 'y') or (isset($translationsCount) and $translationsCount gt 1)}
{if $prefs.feature_multilingual eq 'y' && $prefs.show_available_translations eq 'y' && $machine_translate_to_lang eq '' }
@@ -80,9 +80,9 @@
{*<li role="presentation">*}
<span class="dropdown-item" role="menuitem" tabindex="-1">
{if $backlinks[back].type eq 'wiki page'}
- {icon name="notepad"}
+ <span class="me-1">{icon name="notepad"}</span>
{elseif $backlinks[back].type eq 'trackeritemfield'}
- {icon name="database"}
+ <span class="me-1">{icon name="database"}</span>
{/if}
{if $prefs.wiki_backlinks_name_len ge '1'}
{object_link id=$backlinks[back].objectId type=$backlinks[back].type title=$smarty.capture.backlink_title|truncate:$prefs.wiki_backlinks_name_len:"...":true}
@@ -329,3 +329,4 @@
{/strip}
</div>
{/if}
+{*</div> div.wikitopline *}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/df88dcee5c163c294703eb873fc286fb428a0139
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/df88dcee5c163c294703eb873fc286fb428a0139
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