[MSKINS-245] Add code highlighting class to every <pre><code> combination

[kwin]

Don't rely on custom div classes surrounding those as those are not always set.

[michael-o]

This is broken as it does not reflect the skin structure AND the CSS anymore.

[kwin]

This is therefore only a draft to outline how this should work IMHO on the Skin side. Would you mind commenting on the general approach to only rely on <pre><code> for block codes?

[michael-o]

You missed to change:

maven-fluido-skin/src/main/resources/css/maven-base.css

Lines 33 to 36 in d5eef27

	section > div.verbatim {
	margin-right: 7px;
	margin-left: 7px;
	}

[kwin]

This also fixes the missing margin for <div class="source"> (broken in both Fluido 1.x and 2.x), which e.g. can be seen in https://jackrabbit.apache.org/filevault-package-maven-plugin/index.html

[michael-o]

Althrough this looks good and right, it needs to be remain a draft until the fixed Doxia (Sitetools) version is released this can be bumped:

maven-fluido-skin/src/main/resources/META-INF/maven/skin.xml

Line 25 in d5eef27

<doxia-sitetools>2.0.0-M12</doxia-sitetools>

[kwin]

Still requires a m-site-p version depending on m-doxia-sitetools M18+...

[michael-o]

This can now reduced to:

diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 5e0604f..26bb876 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -242 +242 @@
-#*      *#$bodyContent.replaceAll( '<div class="verbatim source">(\r?\n)?<pre>', '<div class="verbatim source"><pre class="' + $sourceStyle + '">' ).replaceAll( 'class="bodyTable"', 'class="table table-striped"' ).replaceAll( 'class="bodyTable bodyTableBorder"', 'class="table table-bordered table-striped"' )
+#*      *#$bodyContent.replace( '<pre><code>', '<pre class="' + $sourceStyle + '"><code>' ).replace( 'class="bodyTable"', 'class="table table-striped"' ).replace( 'class="bodyTable bodyTableBorder"', 'class="table table-bordered table-striped"' )
diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css
index 829ef71..5747cd6 100644
--- a/src/main/resources/css/maven-base.css
+++ b/src/main/resources/css/maven-base.css
@@ -33 +33 @@ section > table.table,
-section > div.verbatim {
+section > pre {

[michael-o]

@kwin Should I rebase and merge this? I'd like to start the release.

[kwin]

Should I rebase and merge this? I'd like to start the release

Yes, please.

[michael-o]

Will merge as soon as CI completes.