public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] The artwork of the ipfire project. branch, master, updated. b8b5b91ba1823f47dc9c97e288e29208c23eccce
@ 2026-03-17 17:48 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-03-17 17:48 UTC (permalink / raw)
  To: ipfire-scm

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The artwork of the ipfire project.".

The branch, master has been updated
       via  b8b5b91ba1823f47dc9c97e288e29208c23eccce (commit)
       via  22c7d4be91ec7db79460f50a2c809c7cc95fdb16 (commit)
       via  3fcb3297c8ee2d8272c074aede736ebfa0890fcd (commit)
       via  2aa2c720c14460ea685e7e927e79e53588e9a215 (commit)
       via  d3db4254923a4564a074d7f5a26bc6f319bbacf5 (commit)
       via  d326ceec86979293fb3327e3bfea2ef292b12f76 (commit)
       via  27805dc60d5dfde9208bf492477521418bf5bee6 (commit)
      from  3cfd1dacb3c2ebe76f21a27f9af7d960e90fdcf5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8b5b91ba1823f47dc9c97e288e29208c23eccce
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 17:28:12 2026 +0000

    logo: Simplify the SVG input file
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 22c7d4be91ec7db79460f50a2c809c7cc95fdb16
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 17:24:12 2026 +0000

    logos: Change the naming of the small logo as it is no longer square
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 3fcb3297c8ee2d8272c074aede736ebfa0890fcd
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 17:18:30 2026 +0000

    logo: Rename "squared" to small
    
    There is no point in adding all the padding. Instead of being
    actually squared, this logo is actually more "small" in that it
    will need less width.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 2aa2c720c14460ea685e7e927e79e53588e9a215
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 17:11:45 2026 +0000

    Makefile: Let rsvg-convert generate the final SVGs
    
    These files are much more compact and not so busy with unnecessary stuff
    that Inkscape generates.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit d3db4254923a4564a074d7f5a26bc6f319bbacf5
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 17:02:05 2026 +0000

    favicon: Generate the favicon only for the standard design
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit d326ceec86979293fb3327e3bfea2ef292b12f76
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 16:57:52 2026 +0000

    favicon: Give it a white background
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 27805dc60d5dfde9208bf492477521418bf5bee6
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Mar 17 16:44:01 2026 +0000

    Makefile: Use rsvg-convert to generate output files
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile        | 141 +++++++++++++++++++++++++++++++-------------------------
 logo-small.svg  |  30 ++++++++++++
 logo-square.svg |  51 --------------------
 logo.svg        |  82 ++++++++------------------------
 4 files changed, 128 insertions(+), 176 deletions(-)
 create mode 100644 logo-small.svg
 delete mode 100644 logo-square.svg

Difference in files:
diff --git a/Makefile b/Makefile
index 2ab4dd1..3b54bcd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,38 +3,43 @@ STYLES = \
 	inverted \
 	monochrome
 
-FILES = \
-	logo.svg \
-	logo.pdf \
-	logo-512.png \
-	logo-1024.png \
-	logo-2048.png \
-	logo-4096.png \
-	\
-	logo-square.pdf \
-	logo-square.svg \
-	logo-square-512x512.png \
-	logo-square-1024x1024.png \
-	logo-square-2048x2048.png \
-	logo-square-4096x4096.png \
-	\
-	favicon.svg \
-	favicon-16x16.png \
-	favicon-32x32.png \
-	favicon-64x64.png \
-	favicon-128x128.png \
-	favicon-256x256.png \
-	\
-	apple-touch-icon.png
-
-OBJECTS = \
-	$(foreach style,$(STYLES),$(foreach file,$(FILES),$(style)/$(file)))
+LOGOS = \
+	logo \
+	logo-small
+
+LOGO_SIZES = \
+	512 \
+	1024 \
+	2048 \
+	4096
+
+# Render the logos as standalone SVG & PDF
+OBJECTS += \
+	$(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(style)/$(logo).svg)) \
+	$(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(style)/$(logo).pdf))
+
+# Render the logos as PNG in all desired sizes
+OBJECTS += \
+	$(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(foreach size,$(LOGO_SIZES),$(style)/$(logo)-$(size).png)))
+
+# The favicon only exists in the standard design
+OBJECTS += \
+	standard/favicon.svg \
+	standard/favicon-16x16.png \
+	standard/favicon-32x32.png \
+	standard/favicon-64x64.png \
+	standard/favicon-128x128.png \
+	standard/favicon-256x256.png \
+	standard/apple-touch-icon.png
 
 # Colors
 PRIMARY = ff2e52
 DARK    = 363636
 WHITE   = ffffff
 
+# rsvg-convert command line
+RSVG_CONVERT = rsvg-convert --keep-aspect-ratio
+
 # Inkscape command line
 INKSCAPE = inkscape $< --export-filename=$@
 
@@ -68,88 +73,98 @@ endef
 all: $(OBJECTS)
 
 # Converts the logo to a plain SVG file without requiring the font
-standard/logo.svg: logo.svg
-	$(TO_PATHS)
-
-%/logo.svg: logo-%.svg
+%-standalone.svg: %.svg
 	$(TO_PATHS)
 
-standard/logo-square.svg: logo-square.svg
-	$(TO_PATHS)
+# Converts the logo to PDF
+%.pdf: %.svg
+	mkdir -p $(dir $@)
+	rsvg-convert --format=pdf1.7 $< > $@
 
-%/logo-square.svg: logo-square-%.svg
-	$(TO_PATHS)
+standard/logo.svg: logo-standalone.svg
+	mkdir -p $(dir $@) && \
+	$(RSVG_CONVERT) --format=svg $< > $@
 
-standard/favicon.svg: favicon.svg
-	$(TO_PATHS)
+%/logo.svg: logo-%-standalone.svg
+	mkdir -p $(dir $@) && \
+	$(RSVG_CONVERT) --format=svg $< > $@
 
-%/favicon.svg: favicon-%.svg
-	$(TO_PATHS)
+standard/logo-small.svg: logo-small-standalone.svg
+	mkdir -p $(dir $@) && \
+	$(RSVG_CONVERT) --format=svg $< > $@
 
-# Converts the logo to PDF
-%.pdf: %.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE)
+%/logo-small.svg: logo-small-%-standalone.svg
+	mkdir -p $(dir $@) && \
+	$(RSVG_CONVERT) --format=svg $< > $@
 
 # Converts the logo to PNG
 %/logo-512.png: %/logo.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=512
+	$(RSVG_CONVERT) --format=png --width=512 $< > $@
 
 %/logo-1024.png: %/logo.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=1024
+	$(RSVG_CONVERT) --format=png --width=1024 $< > $@
 
 %/logo-2048.png: %/logo.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=2048
+	$(RSVG_CONVERT) --format=png --width=2048 $< > $@
 
 %/logo-4096.png: %/logo.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=4096
+	$(RSVG_CONVERT) --format=png --width=4096 $< > $@
+
+# Converts the small logo to PNG
+%/logo-small-512.png: %/logo-small.svg
+	mkdir -p $(dir $@) && \
+	$(RSVG_CONVERT) --format=png --width=512 $< > $@
+
+%/logo-small-1024.png: %/logo-small.svg
+	mkdir -p $(dir $@) && \
+	$(RSVG_CONVERT) --format=png --width=1024 $< > $@
 
-# Converts the square logo to PNG
-%/logo-square-512x512.png: %/logo-square.svg
+%/logo-small-2048.png: %/logo-small.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=512
+	$(RSVG_CONVERT) --format=png --width=2048 $< > $@
 
-%/logo-square-1024x1024.png: %/logo-square.svg
+%/logo-small-4096.png: %/logo-small.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=1024
+	$(RSVG_CONVERT) --format=png --width=4096 $< > $@
 
-%/logo-square-2048x2048.png: %/logo-square.svg
+# Converts the favicon to SVG
+standard/favicon.svg: favicon-standalone.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=2048
+	$(RSVG_CONVERT) --format=svg --background-color="#$(WHITE)" $< > $@
 
-%/logo-square-4096x4096.png: %/logo-square.svg
+%/favicon.svg: favicon-%-standalone.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=4096
+	$(RSVG_CONVERT) --format=svg --background-color="#$(WHITE)" $< > $@
 
 # Converts the favicon to PNG
 %/favicon-16x16.png: %/favicon.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=16
+	$(RSVG_CONVERT) --format=png --width=16 --background-color="#$(WHITE)" $< > $@
 
 %/favicon-32x32.png: %/favicon.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=32
+	$(RSVG_CONVERT) --format=png --width=32 --background-color="#$(WHITE)" $< > $@
 
 %/favicon-64x64.png: %/favicon.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=64
+	$(RSVG_CONVERT) --format=png --width=64 --background-color="#$(WHITE)" $< > $@
 
 %/favicon-128x128.png: %/favicon.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=128
+	$(RSVG_CONVERT) --format=png --width=128 --background-color="#$(WHITE)" $< > $@
 
 %/favicon-256x256.png: %/favicon.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=256
+	$(RSVG_CONVERT) --format=png --width=256 --background-color="#$(WHITE)" $< > $@
 
 # This is like the favicon but in 180x180px
 %/apple-touch-icon.png: %/favicon.svg
 	mkdir -p $(dir $@) && \
-	$(INKSCAPE) --export-width=180
+	$(RSVG_CONVERT) --format=png --width=180 --background-color="#$(WHITE)" $< > $@
 
 # Convert the logo to monochome only
 %-monochrome.svg: %.svg
@@ -166,8 +181,8 @@ clean:
 	rm -vf \
 		logo-inverted.svg \
 		logo-monochrome.svg \
-		logo-square-inverted.svg \
-		logo-square-monochrome.svg \
+		logo-small-inverted.svg \
+		logo-small-monochrome.svg \
 		favicon-inverted.svg \
 		favicon-monochrome.svg
 
diff --git a/logo-small.svg b/logo-small.svg
new file mode 100644
index 0000000..0ba77ba
--- /dev/null
+++ b/logo-small.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg
+   width="512"
+   height="188"
+   viewBox="0 0 512 188"
+   version="1.1"
+   id="svg4"
+   xmlns="http://www.w3.org/2000/svg">
+  <defs id="defs1">
+    <style id="style1">
+      @import url('https://fonts.googleapis.com/css2?family=Prompt:wght@700&amp;display=swap');
+    </style>
+  </defs>
+  <text
+     x="254.19661"
+     y="152"
+     id="text20"
+     font-weight="bold"
+     font-size="180.334px"
+     font-family="Prompt"
+     text-anchor="middle"
+     fill="#363636">IPFire</text>
+  <rect
+     id="rect1"
+     x="0"
+     y="160"
+     width="512"
+     height="28"
+     fill="#ff2e52"/>
+</svg>
diff --git a/logo-square.svg b/logo-square.svg
deleted file mode 100644
index c4894ab..0000000
--- a/logo-square.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg4"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2">
-    <rect
-       x="32.557538"
-       y="159.53194"
-       width="360.57473"
-       height="158.718"
-       id="rect19" />
-    <linearGradient
-       id="swatch1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-    </linearGradient>
-    <style
-       id="style1">
-      @import url('https://fonts.googleapis.com/css2?family=Prompt:wght@700&amp;display=swap');
-    </style>
-  </defs>
-  <rect
-     style="fill:#ff2e52;fill-opacity:1;stroke-width:9.03381;stroke-dasharray:none"
-     id="rect1"
-     width="477"
-     height="28"
-     x="17.5"
-     y="332" />
-  <text
-     xml:space="preserve"
-     id="text19"
-     style="font-weight:bold;font-size:24px;line-height:1.25;font-family:Prompt;-inkscape-font-specification:'Prompt, Bold';text-align:center;white-space:pre;shape-inside:url(#rect19);display:inline" />
-  <text
-     xml:space="preserve"
-     style="font-weight:bold;font-size:180.334px;line-height:1.25;font-family:Prompt;-inkscape-font-specification:'Prompt, Bold';text-align:center;text-anchor:middle;stroke:#ffffff;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
-     x="254.19661"
-     y="320.28918"
-     id="text20"><tspan
-       id="tspan20"
-       x="254.19661"
-       y="320.28918"
-       style="fill:#363636;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-dasharray:none;stroke-opacity:1">IPFire</tspan></text>
-</svg>
diff --git a/logo.svg b/logo.svg
index 56eda25..fbd58ea 100644
--- a/logo.svg
+++ b/logo.svg
@@ -1,66 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<?xml version="1.0" encoding="UTF-8"?>
 <svg
-   width="999.99982"
-   height="280.52844"
-   viewBox="0 0 264.58328 74.223149"
+   width="512"
+   height="143"
+   viewBox="0 0 512 143"
    version="1.1"
    id="svg1"
-   inkscape:version="1.4 (e7c3feb1, 2024-10-09)"
-   sodipodi:docname="logo.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="px"
-     inkscape:zoom="1.3143387"
-     inkscape:cx="283.41248"
-     inkscape:cy="455.74249"
-     inkscape:window-width="1888"
-     inkscape:window-height="927"
-     inkscape:window-x="530"
-     inkscape:window-y="208"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1">
-    <inkscape:page
-       x="0"
-       y="0"
-       width="264.58328"
-       height="74.223152"
-       id="page2"
-       margin="0"
-       bleed="0" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-1.9680621e-5,-95.180093)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:85.0069px;line-height:1.25;font-family:Prompt;-inkscape-font-specification:'Prompt, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#363636;fill-opacity:1;stroke:none;stroke-width:0.442744"
-       x="-3.8252907"
-       y="157.04956"
-       id="text2"
-       transform="scale(0.99983664,1.0001634)"><tspan
-         sodipodi:role="line"
-         id="tspan2"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:85.0069px;font-family:Prompt;-inkscape-font-specification:'Prompt, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.442744"
-         x="-3.8252907"
-         y="157.04956">IPFire<tspan
-   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:85.0069px;font-family:Prompt;-inkscape-font-specification:'Prompt, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ff2e52;fill-opacity:1;stroke-width:0.442744"
-   id="tspan1">_</tspan></tspan></text>
-  </g>
+   xmlns="http://www.w3.org/2000/svg">
+  <defs id="defs1">
+    <style id="style1">
+      @import url('https://fonts.googleapis.com/css2?family=Prompt:wght@700&amp;display=swap');
+    </style>
+  </defs>
+  <text
+     x="0"
+     y="128"
+     id="text2"
+     font-weight="bold"
+     font-size="164px"
+     font-family="Prompt"
+     fill="#363636">IPFire<tspan
+       id="tspan1"
+       fill="#ff2e52">_</tspan></text>
 </svg>


hooks/post-receive
--
The artwork of the ipfire project.


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-03-17 17:48 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-03-17 17:48 [git.ipfire.org] The artwork of the ipfire project. branch, master, updated. b8b5b91ba1823f47dc9c97e288e29208c23eccce Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox