You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/01/01 00:01:53 UTC
[maven-fluido-skin] branch doxia-2.0.0 updated (515e091 -> 0ae2d94)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
discard 515e091 Prepare for Doxia 2.0.0
new 0ae2d94 Prepare for Doxia 2.0.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (515e091)
\
N -- N -- N refs/heads/doxia-2.0.0 (0ae2d94)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
pom.xml | 4 ++--
src/it/mskins-75/verify.groovy | 2 +-
src/main/resources/META-INF/maven/site.vm | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
[maven-fluido-skin] 01/01: Prepare for Doxia 2.0.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit 0ae2d9427eb67c9db3a416477477859602460279
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Dec 11 20:06:00 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 8 ++++----
src/it/mskins-107/verify.groovy | 2 +-
src/it/mskins-75/verify.groovy | 2 +-
src/main/resources/META-INF/maven/site-macros.vm | 6 +++---
src/main/resources/META-INF/maven/site.vm | 2 +-
src/main/resources/META-INF/maven/skin.xml | 2 +-
src/main/resources/css/maven-theme.css | 12 ------------
7 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 49c513b..5866e13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.11.2-SNAPSHOT</version>
+ <version>2.0.0-M1-SNAPSHOT</version>
<name>Apache Maven Fluido Skin</name>
<description>The Apache Maven Fluido Skin is an Apache Maven site skin
@@ -100,9 +100,9 @@ under the License.
<properties>
<bootstrap.version>2.3.2</bootstrap.version>
<jquery.version>1.11.2</jquery.version>
- <sitePluginVersion>3.12.0</sitePluginVersion>
- <projectInfoReportsPluginVersion>3.3.0</projectInfoReportsPluginVersion>
- <project.build.outputTimestamp>2022-06-25T21:21:20Z</project.build.outputTimestamp>
+ <sitePluginVersion>4.0.0-M4</sitePluginVersion>
+ <projectInfoReportsPluginVersion>4.0.0-SNAPSHOT</projectInfoReportsPluginVersion>
+ <project.build.outputTimestamp>2022-12-31T23:33:46Z</project.build.outputTimestamp>
<anchorjs.version>4.2.2</anchorjs.version>
</properties>
diff --git a/src/it/mskins-107/verify.groovy b/src/it/mskins-107/verify.groovy
index 071debc..4d32471 100644
--- a/src/it/mskins-107/verify.groovy
+++ b/src/it/mskins-107/verify.groovy
@@ -20,4 +20,4 @@
File index = new File( basedir, "target/site/index.html" )
assert index.exists()
-assert 1 == index.getText().count("<meta name=\"generator\" content=\"Apache Maven Doxia Site Renderer 1.11.1\" />")
+assert 1 == index.getText().count("<meta name=\"generator\" content=\"Apache Maven Doxia Site Renderer 2.0.0-M4\" />")
diff --git a/src/it/mskins-75/verify.groovy b/src/it/mskins-75/verify.groovy
index ca55c02..8e37951 100644
--- a/src/it/mskins-75/verify.groovy
+++ b/src/it/mskins-75/verify.groovy
@@ -30,6 +30,6 @@ assert 1 == index.getText().count( '''\
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
- </script><noscript><p><img src="http://example.org/piwik/piwik.php?idsite=1" style="border: 0;" alt="Piwik"/></p></noscript>
+ </script><noscript><p><img src="http://example.org/piwik/piwik.php?idsite=1" style="border: 0;" alt="Piwik" /></p></noscript>
<!-- End Piwik Tag -->
'''.replace( "\n", System.getProperty( "line.separator" ) ) )
diff --git a/src/main/resources/META-INF/maven/site-macros.vm b/src/main/resources/META-INF/maven/site-macros.vm
index 90428c9..bff267e 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -567,7 +567,7 @@ $indent </ul>##
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
- </script><noscript><p><img src="http://$piwikUrl/piwik.php?idsite=$idsite" style="border: 0;" alt="Piwik"/></p></noscript>
+ </script><noscript><p><img src="http://$piwikUrl/piwik.php?idsite=$idsite" style="border: 0;" alt="Piwik" /></p></noscript>
<!-- End Piwik Tag -->
#**##end
#end
@@ -685,7 +685,7 @@ $indent </ul>##
#**##if ( $decoration.getCustomChild( 'fluidoSkin.facebookLike' ) && $project.url )
<!-- Load Facebook SDK for JavaScript -->
<div id="fb-root"></div>
- <script async defer crossorigin="anonymous" src="https://connect.facebook.net/${locale}/sdk.js#xfbml=1&version=v6.0"></script>
+ <script async defer crossorigin="anonymous" src="https://connect.facebook.net/#if ( $locale.toString() )$locale#{else}en#end/sdk.js#xfbml=1&version=v6.0"></script>
#**##end
#end
##
@@ -725,7 +725,7 @@ $indent </ul>##
<ul class="nav pull-right" style="border:none; margin-top: 7px"><li>
#* *##end
##
- <a href="https://twitter.com/${user}" class="twitter-follow-button" data-show-count="${showFollowers}" data-align="${dataAlign}" data-size="${dataSize}" data-show-screen-name="${showUser}" data-lang="${locale}">Follow ${user}</a>
+ <a href="https://twitter.com/${user}" class="twitter-follow-button" data-show-count="${showFollowers}" data-align="${dataAlign}" data-size="${dataSize}" data-show-screen-name="${showUser}" data-lang="#if ( $locale.toString() )$locale#{else}en#end">Follow ${user}</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
##
#* *##if ( $sideBarEnabled )
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 9d49dbd..8c68b77 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -29,7 +29,7 @@
| Rendered using Apache Maven Fluido Skin @project.version@
-->
##
-<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) lang="$locale.language"#end>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="#if ( $locale.toString() )$locale.toLanguageTag()#{else}en#end">
<head>
<meta charset="${outputEncoding}" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
diff --git a/src/main/resources/META-INF/maven/skin.xml b/src/main/resources/META-INF/maven/skin.xml
index 711a213..72fb452 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>2.0.0-M4</doxia-sitetools>
</prerequisites>
</skin>
diff --git a/src/main/resources/css/maven-theme.css b/src/main/resources/css/maven-theme.css
index f2c1235..06804e2 100644
--- a/src/main/resources/css/maven-theme.css
+++ b/src/main/resources/css/maven-theme.css
@@ -102,18 +102,6 @@ img.builtBy {
/* Tweaks to the bootstrap theme
--------------------------------- */
-/* sections title are rendered using h2 instead of h1 */
-.hero-unit h2 {
- font-size: 60px;
-}
-
-/* Copied from bootstrap <code> tag style. Maven translates <code> to <tt>. */
-tt {
- padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;
- font-size:0.9em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;
- background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;
-}
-
/* avoid greyed list items */
li {
color:#404040;