From d9e03df878a252d280a66cbb49d6a1daa9eb2e52 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Thu, 20 Apr 2023 16:06:29 +0200 Subject: [PATCH] Update title style --- nummi/main/static/main/css/main.css | 24 +++++++++++++++++++ nummi/main/templates/main/form/account.html | 10 ++++---- nummi/main/templates/main/form/base.html | 12 +++++----- nummi/main/templates/main/form/category.html | 8 +++---- nummi/main/templates/main/form/invoice.html | 2 +- nummi/main/templates/main/form/snapshot.html | 8 +++---- .../main/templates/main/form/transaction.html | 4 ++-- nummi/main/templates/main/list/snapshot.html | 2 +- .../main/templates/main/list/transaction.html | 2 +- nummi/main/templates/main/login.html | 2 +- nummi/main/templates/main/search.html | 2 +- 11 files changed, 50 insertions(+), 26 deletions(-) diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css index f6266d6..52fca37 100644 --- a/nummi/main/static/main/css/main.css +++ b/nummi/main/static/main/css/main.css @@ -173,6 +173,30 @@ a.big-link { font-weight: normal; } +h1, +h2, +h3 { + font-weight: 300; +} +h1 { + font-size: 3rem; + line-height: 1cap; +} +h2 { + font-size: 2rem; +} +h3 { + font-size: 1.5rem; +} +h4 { + font-size: 1.25rem; +} +h5 { + font-size: 1.125rem; +} +h6 { + font-size: 1rem; +} main h1.new { opacity: 0.8; } diff --git a/nummi/main/templates/main/form/account.html b/nummi/main/templates/main/form/account.html index 4853452..0125c77 100644 --- a/nummi/main/templates/main/form/account.html +++ b/nummi/main/templates/main/form/account.html @@ -4,19 +4,19 @@ {% block title_new %} {% translate "Create account" %} {% endblock %} -{% block h1_new %} +{% block h2_new %} {% translate "New account" %} {% endblock %} -{% block h1 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %} +{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %} {% block tables %} {% if not form.instance.adding %} -

{% translate "Statements" %}

+

{% translate "Statements" %}

{% include "main/table/snapshot.html" %} {% endif %} {% if transactions %} -

{% translate "Transactions" %}

+

{% translate "Transactions" %}

{% include "main/table/transaction.html" %} -

{% translate "History" %}

+

{% translate "History" %}

{% include "main/plot/history.html" %} {% endif %} {% endblock %} diff --git a/nummi/main/templates/main/form/base.html b/nummi/main/templates/main/form/base.html index a9003f9..b79d2fe 100644 --- a/nummi/main/templates/main/form/base.html +++ b/nummi/main/templates/main/form/base.html @@ -25,13 +25,13 @@ {% block body %} {% with instance=form.instance %} {% if instance.adding %} -

- {% block h1_new %}{% endblock %} -

+

+ {% block h2_new %}{% endblock %} +

{% else %} -

- {% block h1 %}{{ instance }}{% endblock %} -

+

+ {% block h2 %}{{ instance }}{% endblock %} +

{% endif %} {% block pre %}{% endblock %}
diff --git a/nummi/main/templates/main/form/category.html b/nummi/main/templates/main/form/category.html index 5dea5c2..4a7cc62 100644 --- a/nummi/main/templates/main/form/category.html +++ b/nummi/main/templates/main/form/category.html @@ -4,15 +4,15 @@ {% block title_new %} {% translate "Create category" %} {% endblock %} -{% block h1_new %} +{% block h2_new %} {% translate "New category" %} {% endblock %} -{% block h1 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %} +{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %} {% block tables %} {% if form.instance.transactions %} -

{% translate "Transactions" %}

+

{% translate "Transactions" %}

{% include "main/table/transaction.html" %} -

{% translate "History" %}

+

{% translate "History" %}

{% include "main/plot/history.html" %} {% endif %} {% endblock %} diff --git a/nummi/main/templates/main/form/invoice.html b/nummi/main/templates/main/form/invoice.html index 00ae9ef..6a724f4 100644 --- a/nummi/main/templates/main/form/invoice.html +++ b/nummi/main/templates/main/form/invoice.html @@ -3,6 +3,6 @@ {% block title_new %} {% translate "Create invoice" %} {% endblock %} -{% block h1_new %} +{% block h2_new %} {% translate "New invoice" %} {% endblock %} diff --git a/nummi/main/templates/main/form/snapshot.html b/nummi/main/templates/main/form/snapshot.html index b54a3f2..a76c300 100644 --- a/nummi/main/templates/main/form/snapshot.html +++ b/nummi/main/templates/main/form/snapshot.html @@ -4,10 +4,10 @@ {% block title_new %} {% translate "Create snapshot" %} {% endblock %} -{% block h1_new %} +{% block h2_new %} {% translate "New snapshot" %} {% endblock %} -{% block h1 %} +{% block h2 %} {{ form.instance.sum|check:form.instance.diff }} {{ form.instance }} {% endblock %} @@ -20,11 +20,11 @@ {% endblock %} {% block tables %} {% if categories %} -

{% translate "Categories" %}

+

{% translate "Categories" %}

{% include "main/plot/category.html" %} {% endif %} {% if not form.instance.adding %} -

{% translate "Transactions" %} ({{ form.instance.sum|pmvalue }} / {{ form.instance.diff|pmvalue }})

+

{% translate "Transactions" %} ({{ form.instance.sum|pmvalue }} / {{ form.instance.diff|pmvalue }})

{% include "main/table/transaction.html" %} {% endif %} {% endblock %} diff --git a/nummi/main/templates/main/form/transaction.html b/nummi/main/templates/main/form/transaction.html index 41853fc..e586fc9 100644 --- a/nummi/main/templates/main/form/transaction.html +++ b/nummi/main/templates/main/form/transaction.html @@ -3,7 +3,7 @@ {% block title_new %} {% translate "Create transaction" %} {% endblock %} -{% block h1_new %} +{% block h2_new %} {% translate "New transaction" %} {% endblock %} {% block pre %} @@ -15,7 +15,7 @@ {% endblock %} {% block tables %} {% if not form.instance.adding %} -

{% translate "Invoices" %}

+

{% translate "Invoices" %}

{% include "main/table/invoice.html" %} {% endif %} {% endblock %} diff --git a/nummi/main/templates/main/list/snapshot.html b/nummi/main/templates/main/list/snapshot.html index f73ca0b..b7ce44a 100644 --- a/nummi/main/templates/main/list/snapshot.html +++ b/nummi/main/templates/main/list/snapshot.html @@ -17,7 +17,7 @@ type="text/css" /> {% endblock %} {% block body %} -

{% translate "Statements" %}

+

{% translate "Statements" %}

{% if object %}{{ object }}{% endif %} {% if snapshots %} {% include "main/list/pagination.html" %} diff --git a/nummi/main/templates/main/list/transaction.html b/nummi/main/templates/main/list/transaction.html index 912e45b..70a0c2e 100644 --- a/nummi/main/templates/main/list/transaction.html +++ b/nummi/main/templates/main/list/transaction.html @@ -20,7 +20,7 @@ type="text/css" /> {% endblock %} {% block body %} -

{% translate "Transactions" %}

+

{% translate "Transactions" %}

{% if object %}{{ object }}{% endif %} {% if search %} {% translate "Search" %} diff --git a/nummi/main/templates/main/login.html b/nummi/main/templates/main/login.html index 4ed17e4..8cc7cc7 100644 --- a/nummi/main/templates/main/login.html +++ b/nummi/main/templates/main/login.html @@ -11,7 +11,7 @@ type="text/css" /> {% endblock %} {% block body %} -

{% translate "Log In" %}

+

{% translate "Log In" %}

{% csrf_token %} {% include "main/form/login.html" %} diff --git a/nummi/main/templates/main/search.html b/nummi/main/templates/main/search.html index 0361299..33e5ba1 100644 --- a/nummi/main/templates/main/search.html +++ b/nummi/main/templates/main/search.html @@ -15,7 +15,7 @@ type="text/css" /> {% endblock %} {% block body %} -

{% translate "Search" %}

+

{% translate "Search" %}

{% spaceless %} {% csrf_token %}