]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dbf1d16)
web-user-interface: Replace the old tux logo with out new word mark
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 10 Jan 2024 12:23:15 +0000 (12:23 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 10 Jan 2024 12:23:15 +0000 (12:23 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/web-user-interface patch | blob | blame | history
html/html/themes/ipfire/images/tux2.png [deleted file] patch | blob | blame | history
html/html/themes/ipfire/include/css/style.css patch | blob | blame | history
html/html/themes/ipfire/include/functions.pl patch | blob | blame | history

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 18a8060e06261e4c1a8811707f0b0d07b56f38ca..49f7dc9eaa7a543cba92252e0b11f9b7f76a4170 100644 (file)
--- 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 (file)
index cd84ad5..0000000
Binary files a/html/html/themes/ipfire/images/tux2.png and /dev/null differ
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 6f9345dc4287dfdc2b272fa542f7c74bbd42e788..7cf85d68df8b09bebab706508c82214229db362d 100644 (file)
--- 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 cbd05d1094fb9b1265179592c7b9012e5230735e..27693bcb3f25229f3e320eaae7337bf5f85442c3 100644 (file)
--- 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
IPFire 2.x development tree