From 5b34e410213ac01d557a139d6fa338ca7296140c Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart"
Date: Tue, 18 Apr 2023 11:25:58 +0200
Subject: [PATCH 001/310] Update links
---
nummi/main/locale/fr/LC_MESSAGES/django.mo | Bin 2557 -> 2798 bytes
nummi/main/locale/fr/LC_MESSAGES/django.po | 44 ++++++++++--------
nummi/main/static/main/css/index.css | 9 ++--
nummi/main/static/main/css/main.css | 4 ++
nummi/main/templates/main/index.html | 12 ++---
nummi/main/templates/main/table/snapshot.html | 10 ++++
.../templates/main/table/transaction.html | 10 ++++
7 files changed, 57 insertions(+), 32 deletions(-)
diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.mo b/nummi/main/locale/fr/LC_MESSAGES/django.mo
index 0c4e7035e2488f19057f462f08953e8dc39d0f61..54df9d0ed2ddcc99c0588c858c0ee148773f89a8 100644
GIT binary patch
delta 1351
zcmYk6OK4L;6ow~l`n2`Y7_Igd?aQ{l(xzYwLbal}sVGwL0TT2s0=J3g-nJshT?k?~
zZbU>WZWN1H3z~%>)P;&0-E^g*xDi~cD>qg2`)@|gA!ojsGiS~@^SJpH`x*~EHAJr)
zWDspeUq*~M0NrvLz&;4G|$cj0RI5blQ0U?u!%SzcjGE#q1!|2Wk8R)~w~
zDvkrwM@I_>;0iblwQxVw!o#oz9=GE&Pyr^O0_N@b0#uy9+Al+`ziRC_to=6RXYSEN
zO<>GC9VLDQ>)|3?1z$rI@&T@eU*LMU43#)WHWk(cRZu5X0lhRzoP?SmhKjQfD$gNn
zKOsB$jYEf@IZGplX}Atvf_3l~RDwB3ZZi*K@G*?TS8#-D`)KVgWT$JAP=)S-jc^3+
zg~#mtEDYpuhmI0IfU5KfROQd162F1+Te9}|Q2w7SzgaFronRGRwa{(y@6
z8>;X+s!>6WI)4?=&Pa}ZP=QiViAJI3kJ|Z@Pyrmvb5LK+MHpU{wa-EAv;cLLPoeyl
zAU73?zPN<$zqdFJ9kd$-l60dx3jap`f2eJKluq?sN(|ddXIF2ik+SqdQTZioOCpD2c8|qTRANGoXQ$F1XS5IeD`g
z-Hz%+?B9!07hiFcI)%aLP^8(JPI!LWcP5;yZ^jt;`E=GxpY}7k>@~OIUC($1W7>89
zyLslHt;E?Yj8-m`b&TaEr=0X;BJa4))QkHj9J{Vl8n^Jhx;~N`&t>unKR4+mT*v$C
OPi$-UF>0bTh4}+I95tIGB&zqSy^P4yCz5QAGQ>=aI%iRjfZek7b
zFcWbQD~mW#_T?h_u!@WED0blqT!v?G45zRYpCs$pO??i%{w+HG1M-VTyIzY=oH+11
z7H}RNxPT7KbVTH_8?E;vT``1CIFjmRbe_@Fz8AfIJhdNA?Z=Q`OmfIYE#fpMCO(TM
zzJUFB8CT+UG|?k;A+zWLUZ4qIqKV$5{`crS4Rqdbsr^T4|Ba5zaww2L@|>)|682yP
zO;AOyjd9%1V>yIH>eH--)3}2!>^_G9oWTivjrQkQmHh>DAw_gy!|08av1Xz@oOoe1
zbsRtk97&!`p2H=yUqmOkf{wd}PJ9DRd^fc}NIph>@r;8vIETIXu8aM50Uv4beQTmG
z)mL1Kzi<_rZ7mEUO;JTBnm`wN99_UEbV29Q>!#3oE}`>YP5rl1|Ghl>?*ub6=yUWd
zc!ehToZ9EnJ6k}W#J{qQv*oE~BFhHCo7!oGvc660=wluvT%2E(?_X>pc3Ghe6B~)m
z1i4zf;+>ZXOO_ZV))5x(YCBP}@?UA~8g<_n%j!0*7uu~a5hKKyFPLR3;j?uY{4a1j
mhlm}7UxVAag>V<#A$Mn>KAo#(ZZ\n"
"Language-Team: edpibu \n"
@@ -35,14 +35,14 @@ msgstr "Utilisateur"
#: .\main\models.py:45 .\main\models.py:79 .\main\models.py:87
#: .\main\models.py:237 .\main\templates\main\base.html:39
-#: .\main\templates\main\table\snapshot.html:23
-#: .\main\templates\main\table\transaction.html:32
+#: .\main\templates\main\table\snapshot.html:33
+#: .\main\templates\main\table\transaction.html:42
msgid "Account"
msgstr "Compte"
#: .\main\models.py:45 .\main\models.py:97 .\main\models.py:208
#: .\main\models.py:278 .\main\templates\main\table\invoice.html:9
-#: .\main\templates\main\table\transaction.html:25
+#: .\main\templates\main\table\transaction.html:35
msgid "Name"
msgstr "Nom"
@@ -61,7 +61,7 @@ msgstr "Comptes"
#: .\main\models.py:97 .\main\models.py:121 .\main\models.py:227
#: .\main\templates\main\base.html:49
#: .\main\templates\main\plot\category.html:14
-#: .\main\templates\main\table\transaction.html:29
+#: .\main\templates\main\table\transaction.html:39
msgid "Category"
msgstr "Catégorie"
@@ -90,7 +90,7 @@ msgstr "Valeur de fin"
msgid "Start value"
msgstr "Valeur de début"
-#: .\main\models.py:141 .\main\templates\main\table\snapshot.html:26
+#: .\main\models.py:141 .\main\templates\main\table\snapshot.html:36
msgid "Difference"
msgstr "Différence"
@@ -127,13 +127,13 @@ msgstr "Transaction"
msgid "Description"
msgstr "Description"
-#: .\main\models.py:212 .\main\templates\main\table\snapshot.html:25
-#: .\main\templates\main\table\transaction.html:26
+#: .\main\models.py:212 .\main\templates\main\table\snapshot.html:35
+#: .\main\templates\main\table\transaction.html:36
msgid "Value"
msgstr "Valeur"
-#: .\main\models.py:214 .\main\templates\main\table\snapshot.html:21
-#: .\main\templates\main\table\transaction.html:24
+#: .\main\models.py:214 .\main\templates\main\table\snapshot.html:31
+#: .\main\templates\main\table\transaction.html:34
msgid "Date"
msgstr "Date"
@@ -141,7 +141,7 @@ msgstr "Date"
msgid "Real date"
msgstr "Date réelle"
-#: .\main\models.py:217 .\main\templates\main\table\transaction.html:27
+#: .\main\models.py:217 .\main\templates\main\table\transaction.html:37
msgid "Trader"
msgstr "Commerçant"
@@ -155,7 +155,7 @@ msgstr "Paiement"
#: .\main\templates\main\list\transaction.html:6
#: .\main\templates\main\list\transaction.html:23
#: .\main\templates\main\snapshot_form.html:39
-#: .\main\templates\main\table\snapshot.html:27
+#: .\main\templates\main\table\snapshot.html:37
msgid "Transactions"
msgstr "Transactions"
@@ -242,17 +242,21 @@ msgstr "Aucune facture"
msgid "New invoice"
msgstr "Nouvelle facture"
-#~ msgid "New statement"
-#~ msgstr "Nouveau relevé"
+#: .\main\templates\main\table\snapshot.html:5
+msgid "New statement"
+msgstr "Nouveau relevé"
-#~ msgid "View all statements"
-#~ msgstr "Voir tous les relevés"
+#: .\main\templates\main\table\snapshot.html:10
+msgid "View all statements"
+msgstr "Voir tous les relevés"
-#~ msgid "New transaction"
-#~ msgstr "Ajouter une transaction"
+#: .\main\templates\main\table\transaction.html:6
+msgid "New transaction"
+msgstr "Nouvelle transaction"
-#~ msgid "View all transactions"
-#~ msgstr "Voir toutes les transactions"
+#: .\main\templates\main\table\transaction.html:11
+msgid "View all transactions"
+msgstr "Voir toutes les transactions"
#~ msgid "Valid"
#~ msgstr "Valide"
diff --git a/nummi/main/static/main/css/index.css b/nummi/main/static/main/css/index.css
index f900910..ae42038 100644
--- a/nummi/main/static/main/css/index.css
+++ b/nummi/main/static/main/css/index.css
@@ -12,12 +12,9 @@ h1 img {
margin-right: var(--gap);
}
-#categories > a,
-#accounts > a {
- display: inline-block;
- padding: 1em;
+a.big-link {
+ margin-right: 1em;
}
-#categories > a > i,
-#accounts > a > i {
+a.big-link > i {
margin-right: .5rem;
}
diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css
index 552e652..9c85c75 100644
--- a/nummi/main/static/main/css/main.css
+++ b/nummi/main/static/main/css/main.css
@@ -53,9 +53,13 @@ h1 {
margin: 0;
}
+p {
+ line-height: 2em;
+}
a {
color: var(--text-link);
text-decoration: none;
+ display: inline-block;
}
a:hover {
text-decoration: underline;
diff --git a/nummi/main/templates/main/index.html b/nummi/main/templates/main/index.html
index 96ca5bd..18495c5 100644
--- a/nummi/main/templates/main/index.html
+++ b/nummi/main/templates/main/index.html
@@ -18,11 +18,11 @@
{% if accounts %}
{% translate "Accounts" %}
{% spaceless %}
-
+
{% endspaceless %}
{% endif %}
{% if transactions %}
@@ -34,11 +34,11 @@
{% if categories %}
{% translate "Categories" %}
{% spaceless %}
-
+
{% endspaceless %}
{% endif %}
{% if snapshots %}
diff --git a/nummi/main/templates/main/table/snapshot.html b/nummi/main/templates/main/table/snapshot.html
index c07e6bd..7039cb5 100644
--- a/nummi/main/templates/main/table/snapshot.html
+++ b/nummi/main/templates/main/table/snapshot.html
@@ -1,5 +1,15 @@
{% load main_extras %}
{% load i18n %}
+{% if new_snapshot_url %}
+
+ {% translate "New statement" %}
+
+{% endif %}
+{% if snapshots_url %}
+
+ {% translate "View all statements" %}
+
+{% endif %}
diff --git a/nummi/main/templates/main/table/transaction.html b/nummi/main/templates/main/table/transaction.html
index c21adbe..227becc 100644
--- a/nummi/main/templates/main/table/transaction.html
+++ b/nummi/main/templates/main/table/transaction.html
@@ -1,6 +1,16 @@
{% load main_extras %}
{% load i18n %}
+ {% if new_transaction_url %}
+
+ {% translate "New transaction" %}
+
+ {% endif %}
+ {% if transactions_url %}
+
+ {% translate "View all transactions" %}
+
+ {% endif %}
From 63812637863765e739cd17d4dee4df327fc5de50 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart"
Date: Tue, 18 Apr 2023 11:27:36 +0200
Subject: [PATCH 002/310] Updage paginate_by to 96
---
nummi/main/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nummi/main/views.py b/nummi/main/views.py
index 794c2a1..921ade7 100644
--- a/nummi/main/views.py
+++ b/nummi/main/views.py
@@ -313,7 +313,7 @@ class SnapshotDeleteView(NummiDeleteView):
class NummiListView(UserMixin, ListView):
- paginate_by = 24
+ paginate_by = 96
class TransactionListView(NummiListView):
From d0447e0c8eb956de6d23620667c316b2ab33af0f Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart"
Date: Tue, 18 Apr 2023 12:15:48 +0200
Subject: [PATCH 003/310] Update form style
---
nummi/main/locale/fr/LC_MESSAGES/django.mo | Bin 2798 -> 2843 bytes
nummi/main/locale/fr/LC_MESSAGES/django.po | 18 ++--
nummi/main/static/main/css/form.css | 95 +++++----------------
nummi/main/templates/main/form/base.html | 44 +++++++---
nummi/main/templates/main/search.html | 3 +
5 files changed, 67 insertions(+), 93 deletions(-)
diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.mo b/nummi/main/locale/fr/LC_MESSAGES/django.mo
index 54df9d0ed2ddcc99c0588c858c0ee148773f89a8..4e8449a291932bd1162ad060b6c873d93cc56c02 100644
GIT binary patch
delta 1214
zcmYk+OGs2v9LMqhbsmXdEkwQoiBZ$p~e;X?kn
zwez8lC$J2&sE&Q8jsdQ~Ac_DLCvhb{MNKe`ns5e__ztV_3m)OP{&@MJlCUsf7u%o}_uyLW!=rc}X=~5C
z{v}2`fm-MsYT@&!iNB-9`QhciQSDK^7%m+h9<-$NbI6Rf~lti|vn9~=1ig&H`;>>9Wp)vy`0@`K1@
z9lW&AZdChTRJ(rEgo9px$?LD6`sdv{sK1&A$ULFF@rw7TUp$XG)32z8OURK$WjfQ%
z#J{9Jv;R}GXS5*g!hX*;xr^&ADjzDg8nnXaBk>kS?R)G;G|uU
delta 1185
zcmXZcOKeP07{KvUGg=+>YE6}Di)u^jHEku@L{cghDiH+`vMqLS1MAyQ0Gz-GLH4R{A#UJfFnO4iBlg
z@DnuCmuTj1(1kys{br;66WafK_&c0Kcd(AZjxTa?Tn9RD51Lqiv=7y@|903#17p)Z
z^o5o%bJ_cmvs(P>cI-0-fC1
zu@9YS5M5{#eSRpOA44Y?56_~%n#))@s%W1=-?WS#ug)boDE4wNk#9
Qe^65%t^Jw1F;w{WA3K*$=>Px#
diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.po b/nummi/main/locale/fr/LC_MESSAGES/django.po
index d4bc5b8..d1e39fd 100644
--- a/nummi/main/locale/fr/LC_MESSAGES/django.po
+++ b/nummi/main/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-18 11:13+0200\n"
+"POT-Creation-Date: 2023-04-18 12:10+0200\n"
"PO-Revision-Date: 2022-12-21 17:30+0100\n"
"Last-Translator: edpibu \n"
"Language-Team: edpibu \n"
@@ -188,18 +188,22 @@ msgstr "Annuler"
msgid "Confirm"
msgstr "Confirmer"
-#: .\main\templates\main\form\base.html:17
+#: .\main\templates\main\form\base.html:27
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: .\main\templates\main\form\base.html:28
+#: .\main\templates\main\tag\form_buttons.html:8
+msgid "Save"
+msgstr "Enregistrer"
+
+#: .\main\templates\main\form\base.html:37
#: .\main\templates\main\table\invoice.html:11
#: .\main\templates\main\table\invoice.html:24
#: .\main\templates\main\tag\form_buttons.html:4
msgid "Delete"
msgstr "Supprimer"
-#: .\main\templates\main\form\base.html:20
-#: .\main\templates\main\tag\form_buttons.html:8
-msgid "Save"
-msgstr "Enregistrer"
-
#: .\main\templates\main\index.html:31
msgid "History"
msgstr "Historique"
diff --git a/nummi/main/static/main/css/form.css b/nummi/main/static/main/css/form.css
index dff01e4..90b8aa4 100644
--- a/nummi/main/static/main/css/form.css
+++ b/nummi/main/static/main/css/form.css
@@ -1,92 +1,43 @@
-form {
- display: grid;
- grid-template-columns: auto 1fr;
- grid-gap: var(--gap);
- margin: var(--gap) 0;
- line-height: 2rem;
-}
-
form ul.errorlist {
- grid-column: 1 / -1;
color: var(--red);
font-weight: 550;
list-style-type: "! ";
margin: 0;
}
-form input,
-form select,
-form a {
- padding: 0 var(--gap);
-}
-form textarea {
- padding: var(--gap);
-}
-
-form input {
- color: inherit;
-}
-
-form > label,
-form > div > input[type="text"],
-form > div > input[type="number"],
-form > div > input[type="password"],
-form > div > input[type="file"],
-form > div > select,
-form > div > textarea,
-form > div > select {
- font-size: inherit;
- line-height: inherit;
- font-family: inherit;
- /*height: 100%;*/
- width: 100%;
-}
-form > div > select {
- height: 100%;
-}
-form > div > textarea {
- line-height: initial;
-}
-form > div > input[type="text"],
-form > div > input[type="number"],
-form > div > input[type="password"],
-form > div > input[type="file"],
-form > div > textarea,
-form > div > select {
+form tbody input,
+form tbody select,
+form tbody textarea {
+ font: inherit;
border: none;
- border-radius: var(--radius);
- background: var(--bg-01);
+ background: var(--bg);
+ width: 100%;
+ height: 100%;
+ line-height: 1.5;
}
-form > .buttons {
- grid-column: 1 / -1;
+form tfoot {
text-align: right;
}
-form > .buttons > * {
- font-size: inherit;
- line-height: inherit;
- font-family: inherit;
- border: 0;
- background: var(--bg-01);
- cursor: pointer;
- border-radius: var(--radius);
- display: inline-block;
-}
-form > .buttons > * {
+form tfoot input {
+ font: inherit;
+ line-height: 1.5;
margin-left: var(--gap);
+ border-radius: var(--radius);
+ padding: 0 var(--gap);
+ cursor: pointer;
}
-form > .buttons > *:hover {
+form tfoot input:hover {
text-decoration: underline;
}
-form > .buttons input[type="submit"] {
+form tfoot input[type="submit"] {
+ border: .1rem solid var(--green);
background: var(--green-1);
}
-form > .buttons a.del,
-form > .buttons input.del {
- background: var(--red);
- color: var(--text-inv);
+form tfoot input[type="reset"] {
+ border: .1rem solid var(--red);
+ background: var(--red-1);
}
-
-form input[hidden] {
- display: none;
+form tfoot a.del {
+ color: var(--red);
}
diff --git a/nummi/main/templates/main/form/base.html b/nummi/main/templates/main/form/base.html
index 540693a..a4ed413 100644
--- a/nummi/main/templates/main/form/base.html
+++ b/nummi/main/templates/main/form/base.html
@@ -5,18 +5,34 @@
{% for error in form.non_field_errors %}{{ error }}{% endfor %}
{% endif %}
- {% for field in form %}
- {{ field.errors }}
-
- {{ field }}
- {% endfor %}
-{% endblock %}
-{% block buttons %}
-
+
{% endblock %}
diff --git a/nummi/main/templates/main/search.html b/nummi/main/templates/main/search.html
index cf8af21..2baf470 100644
--- a/nummi/main/templates/main/search.html
+++ b/nummi/main/templates/main/search.html
@@ -10,6 +10,9 @@
+
{% endblock %}
{% block body %}
{% translate "Search" %}
From 58c18195a657f83dc8350aa6b85315bcfb2cf4c5 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart"
Date: Tue, 18 Apr 2023 13:38:29 +0200
Subject: [PATCH 004/310] Update login form
---
nummi/main/templates/main/form/login.html | 9 +++++++++
nummi/main/templates/main/login.html | 19 ++++---------------
2 files changed, 13 insertions(+), 15 deletions(-)
create mode 100644 nummi/main/templates/main/form/login.html
diff --git a/nummi/main/templates/main/form/login.html b/nummi/main/templates/main/form/login.html
new file mode 100644
index 0000000..66f5e65
--- /dev/null
+++ b/nummi/main/templates/main/form/login.html
@@ -0,0 +1,9 @@
+{% extends "main/form/base.html" %}
+{% load i18n %}
+{% block buttons %}
+
+
+
+
+
+{% endblock %}
diff --git a/nummi/main/templates/main/login.html b/nummi/main/templates/main/login.html
index 67218e5..32149b6 100644
--- a/nummi/main/templates/main/login.html
+++ b/nummi/main/templates/main/login.html
@@ -3,6 +3,9 @@
{% load i18n %}
{% block link %}
{{ block.super }}
+
@@ -11,20 +14,6 @@
{% translate "Log In" %}
{% endblock %}
From 057e0ecf742cccfa059b91a2d501866a62fea815 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart"
Date: Tue, 18 Apr 2023 13:46:07 +0200
Subject: [PATCH 005/310] Update design
---
nummi/main/static/main/css/index.css | 14 ----
nummi/main/static/main/css/main.css | 48 +++++++++++---
nummi/main/static/main/css/nav.css | 66 -------------------
nummi/main/templates/main/base.html | 95 ++++++++++++++++++----------
4 files changed, 100 insertions(+), 123 deletions(-)
delete mode 100644 nummi/main/static/main/css/nav.css
diff --git a/nummi/main/static/main/css/index.css b/nummi/main/static/main/css/index.css
index ae42038..1694153 100644
--- a/nummi/main/static/main/css/index.css
+++ b/nummi/main/static/main/css/index.css
@@ -1,17 +1,3 @@
-h1 {
- font-size: 4rem;
- font-variant: small-caps;
- font-weight: 850;
- letter-spacing: -.05em;
- margin: 0;
- line-height: 1.2em;
-}
-h1 img {
- height: 1.2em;
- vertical-align: top;
- margin-right: var(--gap);
-}
-
a.big-link {
margin-right: 1em;
}
diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css
index 9c85c75..54eec0d 100644
--- a/nummi/main/static/main/css/main.css
+++ b/nummi/main/static/main/css/main.css
@@ -43,16 +43,11 @@
body {
font-family: "Inter var experimental", "Inter var", "Inter", sans-serif;
margin: 0;
- padding: 2em;
background: var(--bg);
color: var(--text);
}
-h1 {
- margin: 0;
-}
-
p {
line-height: 2em;
}
@@ -68,8 +63,45 @@ a:hover {
.red {color: var(--red)}
.green {color: var(--text-green)}
-.split {
+body {
display: grid;
- grid-template-columns: repeat(2, auto);
- grid-gap: var(--gap);
+ grid-template-columns: max-content 1fr;
+}
+main {
+ padding: 2rem;
+ grid-column: 2;
+ grid-row: 1;
+}
+nav {
+ grid-column: 1;
+ grid-row: 1;
+ min-height: 100vh;
+ padding: 2rem;
+ background: var(--bg-01);
+ line-height: 2rem;
+}
+nav h1 {
+ font-size: 3rem;
+ height: 1cap;
+ line-height: 1cap;
+}
+nav h1 img {
+ height: inherit;
+}
+nav ul {
+ list-style: none;
+ padding: 0;
+ position: relative;
+}
+nav a.cur {
+ font-weight: 550;
+}
+nav a.cur::after {
+ content: "◎";
+ position: absolute;
+ right: 0;
+}
+nav > :first-child,
+main > :first-child {
+ margin-top: 0;
}
diff --git a/nummi/main/static/main/css/nav.css b/nummi/main/static/main/css/nav.css
deleted file mode 100644
index f488b03..0000000
--- a/nummi/main/static/main/css/nav.css
+++ /dev/null
@@ -1,66 +0,0 @@
-:root {
- --nav-lh: 2em;
- --nav-pad: 1em;
- --nav-height: calc(2 * var(--nav-pad) + var(--nav-lh));
-}
-
-body {
- margin-top: var(--nav-height);
-}
-
-nav {
- background: var(--theme);
- color: var(--text-theme);
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- height: var(--nav-height);
- line-height: var(--nav-lh);
- padding: var(--nav-pad);
-}
-nav > a,
-nav > form {
- display: inline-block;
- color: inherit;
- text-decoration: inherit;
- height: var(--nav-lh);
- margin: 0 var(--nav-pad);
-}
-nav > a.cur {
- font-weight: 750;
-}
-nav > a.logout {
- float: right;
-}
-nav > a img {
- height: var(--nav-lh);
- vertical-align: top;
- margin-right: .5rem;
-}
-nav > a h1 {
- display: inline;
- font: inherit;
- font-variant: small-caps;
-}
-
-nav > form input {
- font: inherit;
- height: inherit;
- border: none;
- background: #ffffff35;
- padding: 0 var(--gap);
-}
-nav > form input[type="text"] {
- border-radius: var(--radius) 0 0 var(--radius);
-}
-nav > form input[type="submit"] {
- border-radius: 0 var(--radius) var(--radius) 0;
-}
-nav > form input[type="submit"] {
- cursor: pointer;
- color: var(--green-text);
-}
-nav > form input[type="submit"]:hover {
- text-decoration: underline;
-}
diff --git a/nummi/main/templates/main/base.html b/nummi/main/templates/main/base.html
index 31c3a5d..3f2c56a 100644
--- a/nummi/main/templates/main/base.html
+++ b/nummi/main/templates/main/base.html
@@ -15,9 +15,6 @@
-
@@ -27,41 +24,69 @@
{% block nav %}
{% spaceless %}
{% endspaceless %}
{% endblock %}
- {% block body %}{% endblock %}
+
+ {% block body %}{% endblock %}
+