From b317852e8abae5d9afa070f9096c76d65b00f379 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sun, 13 Sep 2020 17:13:23 +0200 Subject: [PATCH] static: replace brand.svg with text and font --- README.md | 2 +- helm/Chart.yaml | 2 +- passbook/core/templates/base/page.html | 6 ++-- passbook/core/templates/base/skeleton.html | 6 ++-- passbook/core/templates/login/base_full.html | 6 ++-- passbook/static/static/passbook/brand.svg | 2 -- .../static/static/passbook/brand_inverted.svg | 2 -- .../passbook/fonts/DINEngschriftStd.woff | Bin 0 -> 16768 bytes .../passbook/fonts/DINEngschriftStd.woff2 | Bin 0 -> 12200 bytes .../static/passbook/{pf.css => passbook.css} | 28 ++++++++++++++++++ .../static/passbook/{pf.js => passbook.js} | 0 11 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 passbook/static/static/passbook/brand.svg delete mode 100644 passbook/static/static/passbook/brand_inverted.svg create mode 100644 passbook/static/static/passbook/fonts/DINEngschriftStd.woff create mode 100644 passbook/static/static/passbook/fonts/DINEngschriftStd.woff2 rename passbook/static/static/passbook/{pf.css => passbook.css} (89%) rename passbook/static/static/passbook/{pf.js => passbook.js} (100%) diff --git a/README.md b/README.md index 1c27e464f..75a7a2cf1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -passbook logopassbook +passbook logopassbook [![CI Build status](https://img.shields.io/azure-devops/build/beryjuorg/passbook/1?style=flat-square)](https://dev.azure.com/beryjuorg/passbook/_build?definitionId=1) ![Tests](https://img.shields.io/azure-devops/tests/beryjuorg/passbook/1?compact_message&style=flat-square) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 45d212d10..5d22eafef 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.10.0-rc6" description: A Helm chart for passbook. name: passbook version: "0.10.0-rc6" -icon: https://github.com/BeryJu/passbook/blob/master/passbook/static/static/passbook/logo.svg +icon: https://github.com/BeryJu/passbook/blob/master/docs/images/logo.svg dependencies: - name: postgresql version: 9.3.2 diff --git a/passbook/core/templates/base/page.html b/passbook/core/templates/base/page.html index 9b918451f..1e4e48978 100644 --- a/passbook/core/templates/base/page.html +++ b/passbook/core/templates/base/page.html @@ -20,8 +20,10 @@ - - passbook +
+ passbook icon + passbook +
diff --git a/passbook/core/templates/base/skeleton.html b/passbook/core/templates/base/skeleton.html index f6edef55e..0ba0c1796 100644 --- a/passbook/core/templates/base/skeleton.html +++ b/passbook/core/templates/base/skeleton.html @@ -6,6 +6,8 @@ + + {% block title %}{% trans title|default:"passbook" %}{% endblock %} @@ -14,7 +16,7 @@ - + {% block head %} {% endblock %} @@ -35,6 +37,6 @@ {% endblock %} {% block scripts %} {% endblock %} - + diff --git a/passbook/core/templates/login/base_full.html b/passbook/core/templates/login/base_full.html index 2fe84cd24..1f5a84d85 100644 --- a/passbook/core/templates/login/base_full.html +++ b/passbook/core/templates/login/base_full.html @@ -22,8 +22,10 @@