Merge pull request #4 from diffix/edon/wordmark

yoid2000 · web-flow · commit 9ecaf2a23edf · 2023-11-24T10:57:50.000+01:00
Add wordmark
diff --git a/_includes/header.html b/_includes/header.html
@@ -6,13 +6,8 @@
     <div class="container">
       {% if page.permalink != '/' -%}
       <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl }}/">
-        {%- if site.title == "blank" -%}
-        {%- if site.brand_name -%}
-        <span class="font-weight-bold">{{- site.brand_name -}}&nbsp;</span>
-        {%- endif -%}
-        {%- else -%}
-        {{- site.title -}}
-        {%- endif -%}
+        <img src="/assets/img/logo-flat.png" alt="Open Diffix Logo" width="26" height="26" style="margin-top: -2px; margin-right: 1px;">
+        {% include wordmark.html %}
       </a>
       {%- elsif site.enable_navbar_social -%}
       <!-- Social Icons -->
diff --git a/_includes/wordmark.html b/_includes/wordmark.html
@@ -0,0 +1,3 @@
+<span class="font-weight-bold">
+  <span style="color: #0eb896;">Open</span>&nbsp;<span style="color: #3385e1;">Diffix</span>
+</span>
diff --git a/_layouts/about.html b/_layouts/about.html
@@ -5,10 +5,12 @@
 <!-- about.html -->
 <div class="post">
   <header class="post-header">
-    <h1 class="post-title">
-      {% if site.title == "blank" -%}<span class="font-weight-bold">{{ site.brand_name }}</span>
-      {%- else -%}{{ site.title }}{%- endif %}
-    </h1>
+    <div style="display: flex; align-items: center; gap: 12px;">
+      <img src="/assets/img/logo-flat.png" alt="Open Diffix Logo" style="margin-top: -6px;" width="56" height="56">
+      <h1 class="post-title">
+        {% include wordmark.html %}
+      </h1>
+    </div>
     <p class="desc">{{ page.subtitle }}</p>
   </header>
 
diff --git a/assets/img/logo-flat.png b/assets/img/logo-flat.png

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<span class="font-weight-bold">`
	`2`	`+ <span style="color: #0eb896;">Open</span> <span style="color: #3385e1;">Diffix</span>`
	`3`	`+</span>`