From patchwork Thu Jan 11 13:53:09 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Michael Tremer <michael.tremer@ipfire.org>
X-Patchwork-Id: 7447
Return-Path: <development-bounces@lists.ipfire.org>
Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (secp384r1)
	 client-signature ECDSA (secp384r1))
	(Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK))
	by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9nCt3hWLz3wnw
	for <patchwork@web04.haj.ipfire.org>; Thu, 11 Jan 2024 14:31:22 +0000 (UTC)
Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (secp384r1)
	 client-signature ECDSA (secp384r1))
	(Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK))
	by mail01.ipfire.org (Postfix) with ESMTPS id 4T9nCn1Z1Rz2Xl;
	Thu, 11 Jan 2024 14:31:17 +0000 (UTC)
Received: from mail02.haj.ipfire.org (localhost [127.0.0.1])
	by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9nCm5qhhz32h9;
	Thu, 11 Jan 2024 14:31:16 +0000 (UTC)
Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (secp384r1)
	 client-signature ECDSA (secp384r1))
	(Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK))
	by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T9mMx4fzvz2xPs
	for <development@lists.ipfire.org>; Thu, 11 Jan 2024 13:53:17 +0000 (UTC)
Received: from michael.haj.ipfire.org (michael.haj.ipfire.org [172.28.1.242])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384
	 client-signature ECDSA (secp384r1) client-digest SHA384)
	(Client CN "michael.haj.ipfire.org", Issuer "R3" (verified OK))
	by mail01.ipfire.org (Postfix) with ESMTPS id 4T9mMw63Stz1Gb;
	Thu, 11 Jan 2024 13:53:16 +0000 (UTC)
Received: by michael.haj.ipfire.org (Postfix, from userid 0)
	id 4T9mMw4lLfzTh1X; Thu, 11 Jan 2024 13:53:16 +0000 (UTC)
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] web-user-interface: Replace the old tux logo with out new
 word mark
Date: Thu, 11 Jan 2024 13:53:09 +0000
Message-Id: <20240111135310.4037431-2-michael.tremer@ipfire.org>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240111135310.4037431-1-michael.tremer@ipfire.org>
References: <20240111135310.4037431-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Message-ID-Hash: ROI52GERWOFSBZBUKO2AA7QT24VUPQJN
X-Message-ID-Hash: ROI52GERWOFSBZBUKO2AA7QT24VUPQJN
X-MailFrom: root@michael.haj.ipfire.org
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 digests; suspicious-header
CC: Michael Tremer <michael.tremer@ipfire.org>
X-Mailman-Version: 3.3.8
Precedence: list
List-Id: IPFire development talk <development.lists.ipfire.org>
Archived-At: 
 <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/ROI52GERWOFSBZBUKO2AA7QT24VUPQJN/>
List-Archive: 
 <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/>
List-Help: <mailto:development-request@lists.ipfire.org?subject=help>
List-Owner: <mailto:development-owner@lists.ipfire.org>
List-Post: <mailto:development@lists.ipfire.org>
List-Subscribe: <mailto:development-join@lists.ipfire.org>
List-Unsubscribe: <mailto:development-leave@lists.ipfire.org>

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/web-user-interface    |   1 -
 html/html/themes/ipfire/images/tux2.png       | Bin 9640 -> 0 bytes
 html/html/themes/ipfire/include/css/style.css |  12 +++++++-----
 html/html/themes/ipfire/include/functions.pl  |  11 ++++++-----
 4 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 html/html/themes/ipfire/images/tux2.png

index 6f9345dc4..7cf85d68d 100644

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 18a8060e0..49f7dc9ea 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -344,7 +344,6 @@ srv/web/ipfire/html/redirect-templates/legacy/template.html
 srv/web/ipfire/html/redirect.cgi
 srv/web/ipfire/html/themes
 srv/web/ipfire/html/themes/ipfire
-srv/web/ipfire/html/themes/ipfire/images/tux2.png
 srv/web/ipfire/html/themes/ipfire/include
 srv/web/ipfire/html/themes/ipfire/include/colors.txt
 srv/web/ipfire/html/themes/ipfire/include/css
diff --git a/html/html/themes/ipfire/images/tux2.png b/html/html/themes/ipfire/images/tux2.png
deleted file mode 100644
index cd84ad53d54b0b0d2fa7646fee9746c160bc6841..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9640
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

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -121,7 +121,6 @@ iframe {
 /* Header */
 
 #header {
-	height: 70px;
 	margin: 0 auto;
 }
 
@@ -133,11 +132,14 @@ iframe {
 }
 
 #logo h1 {
-	color: #fff;
-	font-size: 3.6em;
+	color: #ffffff;
+	font-size: 3.5em;
 	font-weight: bold;
-	padding-top: 0.2em;
-	padding-left: 1.7em;
+}
+
+#logo h1 a {
+	color: inherit;
+	text-decoration: none;
 }
 
 /* Main */
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index cbd05d109..27693bcb3 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -140,17 +140,18 @@ print <<END
 	<body>
 		<div id="header" class="fixed">
 			<div id="logo">
-				<a href="https://www.ipfire.org" style="text-decoration: none;">
-					<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
+				<h1>
+					<a href="https://www.ipfire.org">
+						IPFire_
+					</a>
 END
 ;
 	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-		print "</a><h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
-	} else {
-		print "<h1>IPFire</h1></a>";
+		print "&dash; $settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
 	}
 
 print <<END
+				</h1>
 			</div>
 		</div>
 END