This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-fluido-skin-1.x in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit d620473da9fa905d39eb49c84c632468299dbba2 Author: Michael Osipov <micha...@apache.org> AuthorDate: Sun Jan 15 11:18:11 2023 +0100 Don't print CSS class for <li> if none has been provided --- src/it/sidebar/verify.groovy | 2 +- src/it/topbar/verify.groovy | 2 +- src/main/resources/META-INF/maven/site-macros.vm | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/it/sidebar/verify.groovy b/src/it/sidebar/verify.groovy index 6d022e7..66defc8 100644 --- a/src/it/sidebar/verify.groovy +++ b/src/it/sidebar/verify.groovy @@ -28,4 +28,4 @@ assert html.contains( '<li class="active"><a><span class="none"></span>About</a> assert html.contains( '<li><a href="summary.html" title="Summary"><span class="none"></span>Summary</a>' ) assert html.contains( '<li><a href="plugins.html" title="Plugins"><span class="none"></span>Plugins</a></li>' ) // breadcrumb -assert html.contains( '<li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' ) +assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' ) diff --git a/src/it/topbar/verify.groovy b/src/it/topbar/verify.groovy index 98248ac..9cef326 100644 --- a/src/it/topbar/verify.groovy +++ b/src/it/topbar/verify.groovy @@ -28,4 +28,4 @@ assert html.contains( '<li><a title="About">About</a></li>' ) assert html.contains( '<li><a href="summary.html" title="Summary">Summary</a></li>' ) assert html.contains( '<li><a href="plugins.html" title="Plugins">Plugins</a></li>' ) // breadcrumb -assert html.contains( '<li class=""><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' ) +assert html.contains( '<li><a href="https://www.apache.org/" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>' ) diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm index 90428c9..96f4625 100644 --- a/src/main/resources/META-INF/maven/site-macros.vm +++ b/src/main/resources/META-INF/maven/site-macros.vm @@ -224,7 +224,11 @@ #* *##set ( $currentItemHref = './' ) #* *##end ## +#* *##if( !$cssClass.isEmpty() ) <li class="$cssClass">## +#* *##else + <li>## +#end #* *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height false ) #* *#<span class="divider">$breadcrumbDivider</span>## #* *#</li>