From 93fd90fd60852727c4328e50abe681960a34fc8a Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Thu, 28 Nov 2024 22:44:54 +0100 Subject: style adjustment: open sans -> junction/inter --- asset-sources/theme.scss | 26 +++++++++++++++++++++- fietsboek/static/theme.css | 26 +++++++++++++++++++++- fietsboek/static/theme.css.map | 2 +- fietsboek/templates/browse.jinja2 | 38 ++++++++++++++++---------------- fietsboek/templates/details.jinja2 | 20 ++++++++--------- fietsboek/templates/edit.jinja2 | 4 ++-- fietsboek/templates/edit_form.jinja2 | 24 ++++++++++---------- fietsboek/templates/finish_upload.jinja2 | 4 ++-- fietsboek/templates/home.jinja2 | 2 +- fietsboek/templates/layout.jinja2 | 2 +- fietsboek/templates/upload.jinja2 | 6 ++--- fietsboek/templates/user_data.jinja2 | 18 +++++++-------- 12 files changed, 110 insertions(+), 62 deletions(-) diff --git a/asset-sources/theme.scss b/asset-sources/theme.scss index 35a3df1..12eff78 100644 --- a/asset-sources/theme.scss +++ b/asset-sources/theme.scss @@ -3,7 +3,7 @@ html { } body { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Junction", sans-serif; font-weight: 300; color: #101010; background: #efefef; @@ -34,10 +34,24 @@ strong { } } +.navbar { + font-family: "Inter", sans-serif; + font-weight: 400; + margin-bottom: 1em; +} + +.ui-element { + font-family: "Inter", sans-serif; +} + .brand-link { text-decoration: none; } +#homeOverview { + margin-bottom: 1em; +} + .badge-container { width: 50px; height: 50px; @@ -111,6 +125,11 @@ strong { max-width: 100%; } +.track-badges { + justify-content: center; + margin-bottom: 1em; +} + .summary-toggler { cursor: pointer; } @@ -156,6 +175,7 @@ strong { width: 50px; display: inline-block; text-align: right; + font-variant: lining-nums; } .calendar-title { @@ -234,6 +254,10 @@ strong { } } +.browse-summary { + font-variant: lining-nums; +} + /* Ensure a consistent width of the cells in the browse view. */ .browse-summary th, .browse-summary td { width: 25%; diff --git a/fietsboek/static/theme.css b/fietsboek/static/theme.css index 755a986..a04e374 100644 --- a/fietsboek/static/theme.css +++ b/fietsboek/static/theme.css @@ -3,7 +3,7 @@ html { } body { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Junction", sans-serif; font-weight: 300; color: #101010; background: #efefef; @@ -33,10 +33,24 @@ strong { text-decoration: none; } +.navbar { + font-family: "Inter", sans-serif; + font-weight: 400; + margin-bottom: 1em; +} + +.ui-element { + font-family: "Inter", sans-serif; +} + .brand-link { text-decoration: none; } +#homeOverview { + margin-bottom: 1em; +} + .badge-container { width: 50px; height: 50px; @@ -106,6 +120,11 @@ strong { max-width: 100%; } +.track-badges { + justify-content: center; + margin-bottom: 1em; +} + .summary-toggler { cursor: pointer; } @@ -149,6 +168,7 @@ strong { width: 50px; display: inline-block; text-align: right; + font-variant: lining-nums; } .calendar-title { @@ -222,6 +242,10 @@ strong { color: inherit; } +.browse-summary { + font-variant: lining-nums; +} + /* Ensure a consistent width of the cells in the browse view. */ .browse-summary th, .browse-summary td { width: 25%; diff --git a/fietsboek/static/theme.css.map b/fietsboek/static/theme.css.map index 8593cd3..8112079 100644 --- a/fietsboek/static/theme.css.map +++ b/fietsboek/static/theme.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../asset-sources/theme.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EAqCE;EACA;EACA;EACA;EACA;EACA;;AAzCA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAWJ;EACI;;;AAGJ;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;;;AAIJ;AACA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE","file":"theme.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../asset-sources/theme.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EAqCE;EACA;EACA;EACA;EACA;EACA;;AAzCA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAWJ;EACI;;;AAGJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;;;AAIJ;EACE;;;AAGF;AACA;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE","file":"theme.css"} \ No newline at end of file diff --git a/fietsboek/templates/browse.jinja2 b/fietsboek/templates/browse.jinja2 index 308e89d..8877229 100644 --- a/fietsboek/templates/browse.jinja2 +++ b/fietsboek/templates/browse.jinja2 @@ -8,7 +8,7 @@
- +
@@ -17,59 +17,59 @@
- +
- +
- - km + + km
-
+
{{ _("page.browse.filter.length_boundaries") }}
- - km + + km
- +
-
+
{{ _("page.browse.filter.date_boundaries") }}
- +
- @@ -77,7 +77,7 @@ {% if request.identity %}
- +
@@ -104,20 +104,20 @@
- - + {{ _("page.browse.filters.clear_all") }} -
- @@ -208,7 +208,7 @@
{% endfor %} - + {% elif used_filters %}

{{ _("page.browse.no_results") }}

{% else %} diff --git a/fietsboek/templates/details.jinja2 b/fietsboek/templates/details.jinja2 index 7307270..d8c9250 100644 --- a/fietsboek/templates/details.jinja2 +++ b/fietsboek/templates/details.jinja2 @@ -17,9 +17,9 @@ {% if show_edit_link %}
- {{ _("page.details.edit") }} - - + {{ _("page.details.edit") }} + +
@@ -57,9 +57,9 @@
@@ -94,7 +94,7 @@
@@ -146,7 +146,7 @@
{% if track.badges %} -
+
{% for badge in track.badges %} {{ util.render_badge(badge) }} {% endfor %} @@ -212,7 +212,7 @@
{{ util.hidden_csrf_input() }} diff --git a/fietsboek/templates/edit.jinja2 b/fietsboek/templates/edit.jinja2 index a9a4221..6347ae6 100644 --- a/fietsboek/templates/edit.jinja2 +++ b/fietsboek/templates/edit.jinja2 @@ -13,8 +13,8 @@ {{ edit_form.edit_track(track.title, track.date_raw, track.date_tz or 0, track.visibility, track.type, track.description, track.text_tags(), badges, track.tagged_people, images) }} {{ util.hidden_csrf_input() }}
- - {{ _("page.edit.form.cancel") }} + + {{ _("page.edit.form.cancel") }}
diff --git a/fietsboek/templates/edit_form.jinja2 b/fietsboek/templates/edit_form.jinja2 index aa09c9e..e515c3b 100644 --- a/fietsboek/templates/edit_form.jinja2 +++ b/fietsboek/templates/edit_form.jinja2 @@ -1,16 +1,16 @@ {% macro edit_track(title, date, date_tz, visibility, type, description, tags, badges, friends, images) %}
- +
- +
- @@ -23,7 +23,7 @@
- @@ -37,7 +37,7 @@
- + {% if request.identity %} {% for tag in request.identity.autocomplete_tags() | sort %} @@ -47,7 +47,7 @@
-
@@ -64,10 +64,10 @@
- +
-
@@ -101,7 +101,7 @@
- +
@@ -115,8 +115,8 @@
{% endfor %}
- - {% if not request.config.enable_image_uploads %} @@ -146,7 +146,7 @@ diff --git a/fietsboek/templates/finish_upload.jinja2 b/fietsboek/templates/finish_upload.jinja2 index 9ee4576..34d4aac 100644 --- a/fietsboek/templates/finish_upload.jinja2 +++ b/fietsboek/templates/finish_upload.jinja2 @@ -13,8 +13,8 @@ {{ edit_form.edit_track(upload_title, upload_date, upload_date_tz, upload_visibility, upload_type, upload_description, upload_tags, badges, upload_tagged_people, []) }} {{ util.hidden_csrf_input() }}
- - + +
diff --git a/fietsboek/templates/home.jinja2 b/fietsboek/templates/home.jinja2 index 6092669..e9e1d42 100644 --- a/fietsboek/templates/home.jinja2 +++ b/fietsboek/templates/home.jinja2 @@ -23,7 +23,7 @@ {% endif %} {% if summary %} -
+ diff --git a/fietsboek/templates/upload.jinja2 b/fietsboek/templates/upload.jinja2 index 6406e91..b065a96 100644 --- a/fietsboek/templates/upload.jinja2 +++ b/fietsboek/templates/upload.jinja2 @@ -6,11 +6,11 @@

{{ _("page.upload.title") }}

- - + +
{{ util.hidden_csrf_input() }} - +
{% endblock %} diff --git a/fietsboek/templates/user_data.jinja2 b/fietsboek/templates/user_data.jinja2 index 59124ea..eada958 100644 --- a/fietsboek/templates/user_data.jinja2 +++ b/fietsboek/templates/user_data.jinja2 @@ -12,25 +12,25 @@
- +
- +
{{ _("page.my_profile.personal_data.password_invalid") }}
- +
{{ _("page.my_profile.personal_data.password_must_match") }}
{{ util.hidden_csrf_input() }} - +

@@ -41,7 +41,7 @@
{{ util.hidden_csrf_input() }} - +

@@ -54,7 +54,7 @@
{{ util.hidden_csrf_input() }} - +
{{ friend.name }} ({{ friend.email }}) @@ -64,7 +64,7 @@
{{ util.hidden_csrf_input() }} - +
{{ friend_request.sender.name }} ({{ friend_request.sender.email }}) @@ -80,12 +80,12 @@
- +
- +
-- cgit v1.2.3