This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git


The following commit(s) were added to refs/heads/master by this push:
     new bbb4c7e  Use the SVG profile images instead of PNGs exported from them
bbb4c7e is described below

commit bbb4c7ec8412f342c055a6cb5296e7485fec0dc8
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 3 01:28:26 2026 +0000

    Use the SVG profile images instead of PNGs exported from them
    
    The retired, pre-release and sandbox backgrounds were PNG exports of the 
SVGs in src/media. The skin now ships
    the SVGs themselves (32 kB instead of 88 kB), scaled to the size of the 
former PNGs, and still copies only the
    one a site configures.
    
    Closes #332
---
 src/it/mskins-16/verify.groovy                          |   2 +-
 src/it/mskins-23/verify.groovy                          |   9 +++++----
 src/main/resources/META-INF/maven/site-macros.vm        |   8 +++++++-
 src/main/resources/META-INF/maven/skin.xml              |   6 +++---
 src/main/resources/images/profiles/pre-release.png      | Bin 32607 -> 0 bytes
 .../resources/images/profiles}/pre-release.svg          |   0
 src/main/resources/images/profiles/retired.png          | Bin 22003 -> 0 bytes
 .../resources/images/profiles}/retired.svg              |   0
 src/main/resources/images/profiles/sandbox.png          | Bin 33010 -> 0 bytes
 .../resources/images/profiles}/sandbox.svg              |   0
 10 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/it/mskins-16/verify.groovy b/src/it/mskins-16/verify.groovy
index e38c761..aecfc17 100644
--- a/src/it/mskins-16/verify.groovy
+++ b/src/it/mskins-16/verify.groovy
@@ -28,7 +28,7 @@ File site = new File( basedir, "target/site" )
 assert !html.contains( 'gh-fork-ribbon' )
 assert !new File( site, "css/gh-fork-ribbon.min.css" ).exists()
 for ( String profile : [ 'pre-release', 'retired', 'sandbox' ] ) {
-    assert !new File( site, "images/profiles/${profile}.png" ).exists()
+    assert !new File( site, "images/profiles/${profile}.svg" ).exists()
 }
 
 // banner images without alt: the project name when the banner has no name, 
empty when its name gives the text
diff --git a/src/it/mskins-23/verify.groovy b/src/it/mskins-23/verify.groovy
index e5341dc..5435a58 100644
--- a/src/it/mskins-23/verify.groovy
+++ b/src/it/mskins-23/verify.groovy
@@ -20,7 +20,8 @@ File site = new File( basedir, "target/site" )
 String html = new File( site, "index.html" ).text
 
 // only the image of the configured profile is copied
-assert html.contains( "url('./images/profiles/retired.png')" )
-assert new File( site, "images/profiles/retired.png" ).exists()
-assert !new File( site, "images/profiles/sandbox.png" ).exists()
-assert !new File( site, "images/profiles/pre-release.png" ).exists()
+assert html.contains( "url('./images/profiles/retired.svg');background-size: 
336px 252px;" )
+assert new File( site, "images/profiles/retired.svg" ).exists()
+assert !new File( site, "images/profiles/retired.png" ).exists()
+assert !new File( site, "images/profiles/sandbox.svg" ).exists()
+assert !new File( site, "images/profiles/pre-release.svg" ).exists()
diff --git a/src/main/resources/META-INF/maven/site-macros.vm 
b/src/main/resources/META-INF/maven/site-macros.vm
index 050d8d0..31a3346 100644
--- a/src/main/resources/META-INF/maven/site-macros.vm
+++ b/src/main/resources/META-INF/maven/site-macros.vm
@@ -439,7 +439,13 @@ $indent    ##
 #**##if( $profile.equalsIgnoreCase( "retired" )
           || $profile.equalsIgnoreCase( "pre-release" )
           || $profile.equalsIgnoreCase( "sandbox" ) )
-      <style type="text/css">body{background-image: 
url('$relativePath/images/profiles/${profile}.png');}</style>
+## SVG drawn at 700x525: scaled to the size of the PNGs that earlier versions 
shipped
+#*  *##if( $profile.equalsIgnoreCase( "retired" ) )
+#*    *##set( $profileSize = "336px 252px" )
+#*  *##else
+#*    *##set( $profileSize = "420px 315px" )
+#*  *##end
+      <style type="text/css">body{background-image: 
url('$relativePath/images/profiles/${profile}.svg');background-size: 
$profileSize;}</style>
 #**##end
 #end
 ##
diff --git a/src/main/resources/META-INF/maven/skin.xml 
b/src/main/resources/META-INF/maven/skin.xml
index 07b5628..a88e98b 100644
--- a/src/main/resources/META-INF/maven/skin.xml
+++ b/src/main/resources/META-INF/maven/skin.xml
@@ -39,15 +39,15 @@ under the License.
       <vtl-condition><![CDATA[#if( !$site.getCustomValue( 
'fluidoSkin.themeSwitch', 'true' ).equalsIgnoreCase( 'false' ) || 
$site.getCustomValue( 'fluidoSkin.darkThemeEnabled', 'false' 
).equalsIgnoreCase( 'true' ) )true#end]]></vtl-condition>
     </resource-condition>
     <resource-condition>
-      <resource-name>images/profiles/pre-release.png</resource-name>
+      <resource-name>images/profiles/pre-release.svg</resource-name>
       <vtl-condition><![CDATA[#if( $site.getCustomValue( 'fluidoSkin.profile', 
'' ).equalsIgnoreCase( 'pre-release' ) )true#end]]></vtl-condition>
     </resource-condition>
     <resource-condition>
-      <resource-name>images/profiles/retired.png</resource-name>
+      <resource-name>images/profiles/retired.svg</resource-name>
       <vtl-condition><![CDATA[#if( $site.getCustomValue( 'fluidoSkin.profile', 
'' ).equalsIgnoreCase( 'retired' ) )true#end]]></vtl-condition>
     </resource-condition>
     <resource-condition>
-      <resource-name>images/profiles/sandbox.png</resource-name>
+      <resource-name>images/profiles/sandbox.svg</resource-name>
       <vtl-condition><![CDATA[#if( $site.getCustomValue( 'fluidoSkin.profile', 
'' ).equalsIgnoreCase( 'sandbox' ) )true#end]]></vtl-condition>
     </resource-condition>
   </resource-conditions>
diff --git a/src/main/resources/images/profiles/pre-release.png 
b/src/main/resources/images/profiles/pre-release.png
deleted file mode 100644
index d448e85..0000000
Binary files a/src/main/resources/images/profiles/pre-release.png and /dev/null 
differ
diff --git a/src/media/pre-release.svg 
b/src/main/resources/images/profiles/pre-release.svg
similarity index 100%
rename from src/media/pre-release.svg
rename to src/main/resources/images/profiles/pre-release.svg
diff --git a/src/main/resources/images/profiles/retired.png 
b/src/main/resources/images/profiles/retired.png
deleted file mode 100644
index f89f6a2..0000000
Binary files a/src/main/resources/images/profiles/retired.png and /dev/null 
differ
diff --git a/src/media/retired.svg 
b/src/main/resources/images/profiles/retired.svg
similarity index 100%
rename from src/media/retired.svg
rename to src/main/resources/images/profiles/retired.svg
diff --git a/src/main/resources/images/profiles/sandbox.png 
b/src/main/resources/images/profiles/sandbox.png
deleted file mode 100644
index f88b362..0000000
Binary files a/src/main/resources/images/profiles/sandbox.png and /dev/null 
differ
diff --git a/src/media/sandbox.svg 
b/src/main/resources/images/profiles/sandbox.svg
similarity index 100%
rename from src/media/sandbox.svg
rename to src/main/resources/images/profiles/sandbox.svg

Reply via email to