This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-fluido-skin-1.x in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git from 929f586 Bump version to 1.11.2-SNAPSHOT new 6b898dd add Reproducible Builds badge new d1b8813 [MSKINS-197] CSS never applied to <p> and <dt> in section elements new 85316f6 Apply consistent CSS formatting new dafe870 [MSKINS-198] Don't apply font size for <code /> in heading elements new 2f18349 [MSKINS-205] CSS shall only apply to <p> and <dt> if they are immediate children of <section> new 92fc3f7 [MSKINS-206] Apply CSS margins to tables as well new 5270978 [MSKINS-204] Make MSKINS-76 ITs more tolerant new d620473 Don't print CSS class for <li> if none has been provided new 0a9ed79 Print href in anchors for #link() IF href has been provided new 962035c [MSKINS-208] Limit usage of skin to Doxia (Sitetools) 1.x only The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 1 + src/it/mskins-76/verify.groovy | 9 +++-- src/it/mskins-76_topbar/verify.groovy | 9 +++-- src/it/sidebar/verify.groovy | 2 +- src/it/topbar/verify.groovy | 2 +- src/main/resources/META-INF/maven/site-macros.vm | 15 ++++++-- src/main/resources/META-INF/maven/skin.xml | 2 +- src/main/resources/css/maven-base.css | 23 +++++++++-- src/main/resources/css/maven-theme.css | 49 ++++++++++++++++-------- src/main/resources/css/print.css | 18 ++++++++- 10 files changed, 95 insertions(+), 35 deletions(-)
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 52709784159c3b20d4baee62bc37eedc5bee925b Author: Michael Osipov <mi...@apache.org> AuthorDate: Mon Jan 9 10:21:25 2023 +0100 [MSKINS-204] Make MSKINS-76 ITs more tolerant This closes #44 --- src/it/mskins-76/verify.groovy | 9 +++++---- src/it/mskins-76_topbar/verify.groovy | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/it/mskins-76/verify.groovy b/src/it/mskins-76/verify.groovy index 81e466b..9d4deec 100644 --- a/src/it/mskins-76/verify.groovy +++ b/src/it/mskins-76/verify.groovy @@ -19,7 +19,8 @@ File index = new File( basedir, "target/site/index.html" ) assert index.exists() -assert 1 == index.getText().count( '''\ +String text = index.getText().replaceAll( "\r?\n", System.lineSeparator() ) +assert 1 == text.count( '''\ <script> /* <![CDATA[ */ (function() { @@ -28,9 +29,9 @@ assert 1 == index.getText().count( '''\ s.src = 'https://api.flattr.com/js/0.6/load.js?mode=auto'; t.parentNode.insertBefore(s, t); })(); - /* ]]> */</script>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) + /* ]]> */</script>'''.replaceAll( "\r?\n", System.lineSeparator() ) ) -assert 1 == index.getText().count( '''\ +assert 1 == text.count( '''\ <a class="FlattrButton" style="display:none;" href="http://opensource.org/"></a> <noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank"> - <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) + <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replaceAll( "\r?\n", System.lineSeparator() ) ) diff --git a/src/it/mskins-76_topbar/verify.groovy b/src/it/mskins-76_topbar/verify.groovy index 3dd79ba..bf651d0 100644 --- a/src/it/mskins-76_topbar/verify.groovy +++ b/src/it/mskins-76_topbar/verify.groovy @@ -19,7 +19,8 @@ File index = new File( basedir, "target/site/index.html" ) assert index.exists() -assert 1 == index.getText().count( '''\ +String text = index.getText().replaceAll( "\r?\n", System.lineSeparator() ) +assert 1 == text.count( '''\ <script> /* <![CDATA[ */ (function() { @@ -28,9 +29,9 @@ assert 1 == index.getText().count( '''\ s.src = 'https://api.flattr.com/js/0.6/load.js?mode=auto'; t.parentNode.insertBefore(s, t); })(); - /* ]]> */</script>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) + /* ]]> */</script>'''.replaceAll( "\r?\n", System.lineSeparator() ) ) -assert 1 == index.getText().count( '''\ +assert 1 == text.count( '''\ <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://opensource.org/"></a> <noscript><a href="https://flattr.com/thing/448050/Open-Source-Initiative-OSI" target="_blank"> - <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replace( "\n", System.getProperty( "line.separator" ) ) ) + <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border: 0;" /></a></noscript>'''.replaceAll( "\r?\n", System.lineSeparator() ) )
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 962035c5a87dba88403b0a954c1a2b13f72f99c7 Author: Michael Osipov <mi...@apache.org> AuthorDate: Tue Jan 17 00:20:37 2023 +0100 [MSKINS-208] Limit usage of skin to Doxia (Sitetools) 1.x only --- src/main/resources/META-INF/maven/skin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/maven/skin.xml b/src/main/resources/META-INF/maven/skin.xml index 711a213..a8cb59a 100644 --- a/src/main/resources/META-INF/maven/skin.xml +++ b/src/main/resources/META-INF/maven/skin.xml @@ -22,6 +22,6 @@ under the License. <skin xmlns="http://maven.apache.org/SKIN/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SKIN/1.7.0 http://maven.apache.org/xsd/skin-1.7.0.xsd"> <prerequisites> - <doxia-sitetools>1.11.1</doxia-sitetools> + <doxia-sitetools>[1.11.1,2.0.0-M1)</doxia-sitetools> </prerequisites> </skin>
and
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 2f183497b9f3ea93f613df9c1f4234ce112b11f1 Author: Michael Osipov <mi...@apache.org> AuthorDate: Thu Jan 12 12:55:01 2023 +0100 [MSKINS-205] CSS shall only apply to <p> and <dt> if they are immediate children of <section> --- src/main/resources/css/maven-base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css index 6f6c90a..affdfdc 100644 --- a/src/main/resources/css/maven-base.css +++ b/src/main/resources/css/maven-base.css @@ -26,8 +26,8 @@ display: none; } -section p, -section dt { +section > p, +section > dt { margin-right: 7px; margin-left: 7px; }
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 0a9ed79abf512f046e0c87696a6e4695116ab6f3 Author: Michael Osipov <mi...@apache.org> AuthorDate: Sun Jan 15 11:28:18 2023 +0100 Print href in anchors for #link() IF href has been provided --- src/main/resources/META-INF/maven/site-macros.vm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm index 96f4625..a0890d6 100644 --- a/src/main/resources/META-INF/maven/site-macros.vm +++ b/src/main/resources/META-INF/maven/site-macros.vm @@ -84,14 +84,19 @@ #**##else #* *##set ( $linkClass = "" ) #**##end +#**##if( $href ) +#* *##set ( $href = ' href="' + $href + '"' ) +#**##else +#* *##set ( $href = "" ) +#**##end #**##if ( $img ) #* *##if ( $position == "left" ) -#* *#<a href="$href"$linkClass$linkTarget$linkTitle>#image( $img $alt $border $width $height )$name</a>## +#* *#<a$href$linkClass$linkTarget$linkTitle>#image( $img $alt $border $width $height )$name</a>## #* *##else -#* *#<a href="$href"$linkClass$linkTarget$linkTitle>$name #image( $img $alt $border $width $height )</a>## +#* *#<a$href$linkClass$linkTarget$linkTitle>$name #image( $img $alt $border $width $height )</a>## #* *##end #**##else -#* *#<a href="$href"$linkClass$linkTarget$linkTitle>## +#* *#<a$href$linkClass$linkTarget$linkTitle>## #* *##if( $icon ) #* *#<span class="$icon"></span>## #* *##end
in heading elementsThis 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 dafe8707ebf89631b3057f7039a2b7c20275f6ba Author: Michael Osipov <mi...@apache.org> AuthorDate: Sun Dec 11 00:03:14 2022 +0100 [MSKINS-198] Don't apply font size for <code /> in heading elements --- src/main/resources/css/maven-theme.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/resources/css/maven-theme.css b/src/main/resources/css/maven-theme.css index ec137a2..f2c1235 100644 --- a/src/main/resources/css/maven-theme.css +++ b/src/main/resources/css/maven-theme.css @@ -155,3 +155,11 @@ li.pull-right { a.dropdown-toggle { cursor: pointer; } + +h1 > code, +h2 > code, +h3 > code, +h4 > code, +h5 > code { + font-size: unset; +}
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 <mi...@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>
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 92fc3f72946f4c40549482d7e7918a218b0fb06d Author: Michael Osipov <mi...@apache.org> AuthorDate: Thu Jan 12 16:26:14 2023 +0100 [MSKINS-206] Apply CSS margins to tables as well --- src/main/resources/css/maven-base.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css index affdfdc..fddbc17 100644 --- a/src/main/resources/css/maven-base.css +++ b/src/main/resources/css/maven-base.css @@ -27,7 +27,8 @@ } section > p, -section > dt { +section > dt, +section > table.table { margin-right: 7px; margin-left: 7px; }
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 85316f69b5810c0d9b5e46a0564ec34e41273536 Author: Michael Osipov <mi...@apache.org> AuthorDate: Sat Dec 10 23:14:09 2022 +0100 Apply consistent CSS formatting --- src/main/resources/css/maven-base.css | 22 ++++++++++++++---- src/main/resources/css/maven-theme.css | 41 +++++++++++++++++++++------------- src/main/resources/css/print.css | 18 +++++++++++++-- 3 files changed, 60 insertions(+), 21 deletions(-) diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css index e7df1e1..6f6c90a 100644 --- a/src/main/resources/css/maven-base.css +++ b/src/main/resources/css/maven-base.css @@ -17,7 +17,21 @@ * under the License. */ -.clear{clear:both;visibility: hidden;} -.clear hr{display: none;} -section p,section dt{margin-right: 7px;margin-left: 7px;} -#poweredBy{text-align: center} +.clear { + clear: both; + visibility: hidden; +} + +.clear hr { + display: none; +} + +section p, +section dt { + margin-right: 7px; + margin-left: 7px; +} + +#poweredBy { + text-align: center; +} diff --git a/src/main/resources/css/maven-theme.css b/src/main/resources/css/maven-theme.css index a18b90b..ec137a2 100644 --- a/src/main/resources/css/maven-theme.css +++ b/src/main/resources/css/maven-theme.css @@ -22,40 +22,50 @@ a.externalLink { padding-right: 18px; } a.newWindow { - background: url('../images/window-new.png') right center no-repeat;padding-right: 18px; + background: url('../images/window-new.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href^=http] { - background: url('../images/internet-web-browser.png') right center no-repeat;padding-right: 18px; + background: url('../images/internet-web-browser.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href$=".asc"] { - background: url('../images/accessories-text-editor.png') right center no-repeat;padding-right: 18px; + background: url('../images/accessories-text-editor.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href$=".jpg"], a.externalLink[href$=".jpeg"], a.externalLink[href$=".gif"], a.externalLink[href$=".png"] { - background: url('../images/image-x-generic.png') right center no-repeat;padding-right: 18px; + background: url('../images/image-x-generic.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href$=".tar.gz"], a.externalLink[href$=".zip"] { - background: url('../images/package-x-generic.png') right center no-repeat;padding-right: 18px; + background: url('../images/package-x-generic.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href$=".md5"], a.externalLink[href$=".sha1"] { - background: url('../images/document-properties.png') right center no-repeat;padding-right: 18px; + background: url('../images/document-properties.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href^=https] { - background: url('../images/application-certificate.png') right center no-repeat;padding-right: 18px; + background: url('../images/application-certificate.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href^=file] { - background: url('../images/drive-harddisk.png') right center no-repeat;padding-right: 18px; + background: url('../images/drive-harddisk.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href^=ftp] { - background: url('../images/network-server.png') right center no-repeat;padding-right: 18px; + background: url('../images/network-server.png') right center no-repeat; + padding-right: 18px; } a.externalLink[href^=mailto] { - background: url('../images/contact-new.png') right center no-repeat;padding-right: 18px; + background: url('../images/contact-new.png') right center no-repeat; + padding-right: 18px; } li.none { @@ -85,7 +95,8 @@ img.builtBy { } #search-form { - margin-left: 9px;margin-right:9px; + margin-left: 9px; + margin-right: 9px; } /* Tweaks to the bootstrap theme @@ -110,18 +121,18 @@ li { /* avoid transparent background of table */ table.zebra-striped { - background-color:#FFF + background-color:#FFF; } /* avoid transparent footer */ .footer { - background-color:#EEE + background-color:#EEE; } /* align with adjustments of http://twitter.github.com/bootstrap/examples/fluid.html */ .sidebar-nav { - padding-left: 0px; - padding-right: 0px; + padding-left: 0px; + padding-right: 0px; } .sidebar-nav .icon-chevron-right, .sidebar-nav .icon-chevron-down { diff --git a/src/main/resources/css/print.css b/src/main/resources/css/print.css index cd19a8c..d637584 100644 --- a/src/main/resources/css/print.css +++ b/src/main/resources/css/print.css @@ -17,5 +17,19 @@ * under the License. */ -#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {display: none !important;} -#bodyColumn, body.docs div.docs {margin: 0 !important;border: none !important} +#banner, +#footer, +#leftcol, +#breadcrumbs, +.docs #toc, +.docs .courtesylinks, +#leftColumn, +#navColumn { + display: none !important; +} + +#bodyColumn, +body.docs div.docs { + margin: 0 !important; + border: none !important; +}
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 6b898dd61a2fdb3464f2575efcc1f638f3cc9a91 Author: Hervé Boutemy <hb...@apache.org> AuthorDate: Wed Nov 2 18:00:03 2022 +0100 add Reproducible Builds badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c49de8f..402cb54 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Contributing to [Apache Maven Fluido Skin](https://maven.apache.org/skins/maven- [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MSKINS.json)][jira] [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license] [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.skins/maven-fluido-skin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.skins/maven-fluido-skin) +[![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green?labelColor=blue)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/skins/fluido/README.md) [![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-fluido-skin/job/master.svg)][build]
and
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 d1b8813e522c71819778cd94e7ef548443b70bd0 Author: Michael Osipov <mi...@apache.org> AuthorDate: Sat Dec 10 23:40:40 2022 +0100 [MSKINS-197] CSS never applied to <p> and <dt> in section elements --- src/main/resources/css/maven-base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css index 072cc38..e7df1e1 100644 --- a/src/main/resources/css/maven-base.css +++ b/src/main/resources/css/maven-base.css @@ -19,5 +19,5 @@ .clear{clear:both;visibility: hidden;} .clear hr{display: none;} -.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left: 7px;} +section p,section dt{margin-right: 7px;margin-left: 7px;} #poweredBy{text-align: center}