Merge remote-tracking branch 'origin/master'

# Conflicts: # templates/index.html
2024-12-01 21:00:48 +01:00 · 2024-12-01 21:00:48 +01:00 · ca72a91d20
parent 93e1ac1f1b a6abab998e
commit ca72a91d20
2 changed files with 2 additions and 2 deletions
--- a/media/Asset
+++ b/media/Asset
--- a/templates/base.html
+++ b/templates/base.html
@ -17,8 +17,8 @@
 </head>
 <body>
  <nav class="navbar navbar-expand-lg navbar-dark" style="background-color: #000;">
-        <a class="navbar-brand" href="/">
-            <img src="/media/Asset 2.png" alt="BH Logo" height="40"> Beyond Heroes
+        <a class="navbar-brand" href="/" style="font-size: 24px;">
+            <img src="/media/Asset 3.png" alt="BH Logo" height="30" style="padding-right: 2px;"> Beyond Heroes
        </a>
        <div class="ml-auto"></div>
        <div class="justify-content-center" id="navbarNav">