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. 9639dbe6ec8ed4c7c27b83da912b3611349def90
@ 2026-03-13 15:01 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-03-13 15:01 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  9639dbe6ec8ed4c7c27b83da912b3611349def90 (commit)
       via  48d1011f6015caf4a014cb37cc5e887be0b65ce3 (commit)
       via  bc456d46b5474f2954d21a23f43c758b53f69122 (commit)
       via  2f44b88557f80a07dc6201d632522f5bfc2f6dcf (commit)
       via  a906698afcefbbbccd44a02dba6631c0edf2e60e (commit)
       via  5fe6332f71700e2d319c09ff49d3c395a503fe73 (commit)
       via  11b9a0cd88a33d2438f278fbeaa0ff69a0779639 (commit)
       via  b67c4905a73a2afedb7f7c7d86cd6a15de40fb01 (commit)
      from  6eb64be1ad1d1bc37e2b09b379f0656700550cab (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 9639dbe6ec8ed4c7c27b83da912b3611349def90
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 15:00:59 2026 +0000

    logo: Simplify the filenames
    
    The NxN naming suggested that the logo was square which it actually isn't.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 48d1011f6015caf4a014cb37cc5e887be0b65ce3
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:59:56 2026 +0000

    logo: Generate a 4096px version
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit bc456d46b5474f2954d21a23f43c758b53f69122
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:58:47 2026 +0000

    Makefile: Create a target to upload all files
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 2f44b88557f80a07dc6201d632522f5bfc2f6dcf
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:31:41 2026 +0000

    Makefile: Simplify listing files that should be generated
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit a906698afcefbbbccd44a02dba6631c0edf2e60e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:29:20 2026 +0000

    favicon: Keep the rendered SVG file
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 5fe6332f71700e2d319c09ff49d3c395a503fe73
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:22:20 2026 +0000

    Makefile: Generate favicons in all designs, too
    
    The file has also been stripped from all the repetition so
    that it will be much shorter to add additional stuff.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 11b9a0cd88a33d2438f278fbeaa0ff69a0779639
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:21:56 2026 +0000

    logo: Make the font of the logo slightly off-black
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit b67c4905a73a2afedb7f7c7d86cd6a15de40fb01
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Mar 13 14:21:35 2026 +0000

    favicon: Update the design to say "IPFire"
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 Makefile    | 198 +++++++++++++++++++++++++++++++-----------------------------
 favicon.svg |  54 ++++++++++-------
 logo.svg    |   2 +-
 3 files changed, 136 insertions(+), 118 deletions(-)

Difference in files:
diff --git a/Makefile b/Makefile
index bff88d3..22d8abd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,133 +1,139 @@
-OBJECTS = \
-	standard/logo.svg \
-	standard/logo.pdf \
-	standard/logo-512x512.png \
-	standard/logo-1024x1024.png \
-	standard/logo-2048x2048.png \
-	standard/favicon-32x32.png \
-	standard/favicon-64x64.png \
-	standard/favicon-128x128.png \
-	standard/favicon-256x256.png \
-	\
-	monochrome/logo.svg \
-	monochrome/logo.pdf \
-	monochrome/logo-512x512.png \
-	monochrome/logo-1024x1024.png \
-	monochrome/logo-2048x2048.png \
+STYLES = \
+	standard \
+	inverted \
+	monochrome
+
+FILES = \
+	logo.svg \
+	logo.pdf \
+	logo-512.png \
+	logo-1024.png \
+	logo-2048.png \
+	logo-4096.png \
 	\
-	inverted/logo.svg \
-	inverted/logo.pdf \
-	inverted/logo-512x512.png \
-	inverted/logo-1024x1024.png \
-	inverted/logo-2048x2048.png
+	favicon.svg \
+	favicon-32x32.png \
+	favicon-64x64.png \
+	favicon-128x128.png \
+	favicon-256x256.png \
+	favicon-512x512.png
+
+OBJECTS = \
+	$(foreach style,$(STYLES),$(foreach file,$(FILES),$(style)/$(file)))
+
+# Colors
+PRIMARY = ff2e52
+DARK    = 363636
+WHITE   = ffffff
 
 # Inkscape command line
 INKSCAPE = inkscape $< --export-filename=$@
 
+# Macro to render fonts to paths so that we won't need to load the font
+define TO_PATHS
+	mkdir -p $(dir $@) && \
+	$(INKSCAPE) \
+		--batch-process \
+		--actions="select-all;object-to-path;export-plain-svg"
+endef
+
+define TO_INVERTED
+	mkdir -p $(dir $@) && \
+	sed \
+		-e "s/fill=\"#$(DARK)\"/fill=\"#$(WHITE)\"/g" \
+		-e "s/fill:#$(DARK)/fill:#$(WHITE)/g" \
+		-e "s/stroke:[^;\"]*/stroke:none/g" \
+		< $< > $@
+endef
+
+define TO_MONOCHROME
+	mkdir -p $(dir $@) && \
+	sed \
+		-e "s/fill:[^;\"]*/fill:#$(DARK)/g" \
+		-e "s/fill=\"[^\"]*\"/fill=\"#$(DARK)\"/g" \
+		-e "s/stroke:[^;\"]*/stroke:none/g" \
+		< $< > $@
+endef
+
 .PHONY: all
 all: $(OBJECTS)
 
 # Converts the logo to a plain SVG file without requiring the font
 standard/logo.svg: logo.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) \
-		--batch-process \
-		--actions="select-all;object-to-path;export-plain-svg"
+	$(TO_PATHS)
+
+# Converts the logo to a plain SVG file without requiring the font
+%/logo.svg: logo-%.svg
+	$(TO_PATHS)
+
+# Converts the favicon to a plain SVG file without requiring the font
+standard/favicon.svg: favicon.svg
+	$(TO_PATHS)
+
+%/favicon.svg: favicon-%.svg
+	$(TO_PATHS)
 
 # Converts the logo to PDF
-standard/logo.pdf: logo.svg
+%/logo.pdf: %/logo.svg
 	mkdir -p $(dir $@)
 	$(INKSCAPE)
 
-# Converts the logo to a transparent PNG image with 512x512 pixels
-standard/logo-512x512.png: logo.svg
-	mkdir -p $(dir $@)
+# Converts the logo to PNG
+%/logo-512.png: %/logo.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=512
 
-standard/logo-1024x1024.png: logo.svg
-	mkdir -p $(dir $@)
+%/logo-1024.png: %/logo.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=1024
 
-standard/logo-2048x2048.png: logo.svg
-	mkdir -p $(dir $@)
+%/logo-2048.png: %/logo.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=2048
 
-standard/favicon-32x32.png: favicon.svg
-	mkdir -p $(dir $@)
+%/logo-4096.png: %/logo.svg
+	mkdir -p $(dir $@) && \
+	$(INKSCAPE) --export-width=4096
+
+# Converts the favicon to PNG
+%/favicon-32x32.png: %/favicon.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=32
 
-standard/favicon-64x64.png: favicon.svg
-	mkdir -p $(dir $@)
+%/favicon-64x64.png: %/favicon.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=64
 
-standard/favicon-128x128.png: favicon.svg
-	mkdir -p $(dir $@)
+%/favicon-128x128.png: %/favicon.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=128
 
-standard/favicon-256x256.png: favicon.svg
-	mkdir -p $(dir $@)
+%/favicon-256x256.png: %/favicon.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=256
 
-# Convert the logo to monochome only
-logo-monochrome.svg: logo.svg
-	sed "s/fill:[^;\"]*/fill:#000000/g; s/stroke:[^;\"]*/stroke:none/g" < $< > $@
-
-# Converts the logo to a plain SVG file without requiring the font
-monochrome/logo.svg: logo-monochrome.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) \
-		--batch-process \
-		--actions="select-all;object-to-path;export-plain-svg"
-
-# Converts the logo to PDF
-monochrome/logo.pdf: logo-monochrome.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE)
-
-# Converts the logo to a transparent PNG image with 512x512 pixels
-monochrome/logo-512x512.png: logo-monochrome.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) --export-width=512
-
-monochrome/logo-1024x1024.png: logo-monochrome.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) --export-width=1024
-
-monochrome/logo-2048x2048.png: logo-monochrome.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) --export-width=1024
-
-# Convert the logo to use white only
-logo-inverted.svg: logo.svg
-	sed "s/fill:[^;\"]*/fill:#ffffff/g; s/stroke:[^;\"]*/stroke:none/g" < $< > $@
-
-# Converts the logo to a plain SVG file without requiring the font
-inverted/logo.svg: logo-inverted.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) \
-		--batch-process \
-		--actions="select-all;object-to-path;export-plain-svg"
-
-# Converts the logo to PDF
-inverted/logo.pdf: logo-inverted.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE)
-
-# Converts the logo to a transparent PNG image with 512x512 pixels
-inverted/logo-512x512.png: logo-inverted.svg
-	mkdir -p $(dir $@)
+%/favicon-512x512.png: %/favicon.svg
+	mkdir -p $(dir $@) && \
 	$(INKSCAPE) --export-width=512
 
-inverted/logo-1024x1024.png: logo-inverted.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) --export-width=1024
+# Convert the logo and favicon to monochome only
+%-monochrome.svg: %.svg
+	$(TO_MONOCHROME)
 
-inverted/logo-2048x2048.png: logo-inverted.svg
-	mkdir -p $(dir $@)
-	$(INKSCAPE) --export-width=1024
+# Convert the logo and favicon to use white only
+%-inverted.svg: %.svg
+	$(TO_INVERTED)
 
 .PHONY: clean
 clean:
 	# Remove all generated objects
 	rm -vf $(OBJECTS)
-	rm -vf logo-inverted.svg logo-monochrome.svg
+	rm -vf logo-inverted.svg logo-monochrome.svg favicon-inverted.svg favicon-monochrome.svg
+
+.PHONY: upload
+upload: $(OBJECTS)
+	rsync -avHz --progress --delete --delete-excluded \
+		$(addprefix --filter="+ ",$(STYLES)) \
+		$(addprefix --filter="+ ",$(OBJECTS)) \
+		--filter="- */" --filter="- *" \
+		. people.ipfire.org:/pub/artwork/
diff --git a/favicon.svg b/favicon.svg
index 48eafbd..31117e5 100644
--- a/favicon.svg
+++ b/favicon.svg
@@ -1,26 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="512" height="512" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <style>
+<?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">
+    <style
+       id="style1">
       @import url('https://fonts.googleapis.com/css2?family=Prompt:wght@700&amp;display=swap');
     </style>
   </defs>
-
-  <!-- White background -->
-  <rect width="512" height="512" rx="64" ry="64" fill="#ffffff"/>
-
-  <!-- "IP" bold, centered, filling the upper portion -->
   <text
-    x="256"
-    y="360"
-    text-anchor="middle"
-    dominant-baseline="auto"
-    font-family="'Prompt', 'Arial Black', sans-serif"
-    font-weight="700"
-    font-size="340"
-    letter-spacing="-16"
-    fill="#000000">IP</text>
-
-  <!-- Thick pink underline bar -->
-  <rect x="48" y="390" width="416" height="52" rx="8" fill="#ff2e52"/>
+     x="202.26054"
+     y="283.23462"
+     text-anchor="middle"
+     font-family="Prompt, sans-serif"
+     font-weight="700"
+     font-size="330px"
+     fill="#ffffff"
+     id="text3"
+     transform="matrix(1.1502924,0,0,1.1502924,17.647158,-18.622423)"
+     style="fill:#363636;fill-opacity:1;stroke-width:0.999746;stroke-dasharray:none">IP</text>
+  <text
+     x="254.05888"
+     y="464.11371"
+     text-anchor="middle"
+     font-family="Prompt, sans-serif"
+     font-weight="700"
+     font-size="194.108px"
+     fill="#ff2e52"
+     id="text4"
+     style="stroke-width:1.16932">Fire</text>
 </svg>
diff --git a/logo.svg b/logo.svg
index 8c7e0bf..56eda25 100644
--- a/logo.svg
+++ b/logo.svg
@@ -50,7 +50,7 @@
      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:#000000;fill-opacity:1;stroke:none;stroke-width:0.442744"
+       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"


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-13 15:01 UTC | newest]

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

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