diff --git a/changelog.md b/changelog.md index 1a59183..ff8ce45 100644 --- a/changelog.md +++ b/changelog.md @@ -93,6 +93,7 @@ ### Next ### Improve - Use main tag instead of div with a class +- Font #### Fix - Fix changelog diff --git a/public/styles/form.css b/public/styles/form.css index 20662a7..86222ed 100644 --- a/public/styles/form.css +++ b/public/styles/form.css @@ -2,13 +2,23 @@ width: 100%; } -button, label { - font-family: 'Kanit', sans-serif; +button, +label, +select, +option, +optgroup { + font-family: 'Yantramanav', sans-serif; font-weight: bold; } input, button, +textarea { + font-family: 'Asap', sans-serif; +} + +input, +button, textarea, select, option { diff --git a/public/styles/main.css b/public/styles/main.css index 96dbc16..8ca1007 100644 --- a/public/styles/main.css +++ b/public/styles/main.css @@ -47,7 +47,7 @@ h1, h1 *, h2, h2 *, h3, h3 * { - font-family: 'Kanit', sans-serif; + font-family: 'Yantramanav', sans-serif; } ul { diff --git a/public/styles/nav.css b/public/styles/nav.css index 6300777..b487cb8 100644 --- a/public/styles/nav.css +++ b/public/styles/nav.css @@ -6,6 +6,7 @@ box-shadow: 0 0 0.5rem black; padding-left: 1rem; padding-right: 1rem; + font-family: 'Archivo Narrow', sans-serif; } .nav-category { diff --git a/public/styles/table.css b/public/styles/table.css index f06acd3..10974d4 100644 --- a/public/styles/table.css +++ b/public/styles/table.css @@ -13,6 +13,7 @@ padding-right: 1rem; padding-top: 0.25rem; padding-bottom: 0.25rem; + font-family: 'Yantramanav', sans-serif; } tbody tr:nth-child(even) { diff --git a/templates/_includes/html/base.html.twig b/templates/_includes/html/base.html.twig index abac58f..35add15 100644 --- a/templates/_includes/html/base.html.twig +++ b/templates/_includes/html/base.html.twig @@ -1,7 +1,6 @@ {% set styles=[ - 'https://fonts.googleapis.com/css2?family=Kanit', + 'https://fonts.googleapis.com/css2?family=Yantramanav', 'https://fonts.googleapis.com/css2?family=Asap', - 'https://meyerweb.com/eric/tools/css/reset/reset.css', 'https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css', baseUrl~'icofont/icofont.css', baseUrl~'styles/card.css', diff --git a/templates/_includes/macros/date.html.twig b/templates/_includes/macros/date.html.twig index c868a58..125075e 100644 --- a/templates/_includes/macros/date.html.twig +++ b/templates/_includes/macros/date.html.twig @@ -1,11 +1,11 @@ {% macro iso(date) %} -{{ date|date('Y-m-d') }} + {% endmacro %} {% macro euro(date) %} -{{ date|date('d/m/Y') }} + {% endmacro %} {% macro full(date) %} -{{ date|date('j F Y') }} + {% endmacro %} \ No newline at end of file