diff --git a/app/static/css/container.css b/app/static/css/container.css index cc03686..fa65d7e 100644 --- a/app/static/css/container.css +++ b/app/static/css/container.css @@ -25,5 +25,5 @@ section h2 { section .avatar { display: block; border-radius: 2px; - width: 150px; height: 150px; + width: 128px; height: 128px; } diff --git a/app/static/css/form.css b/app/static/css/form.css index e39ebb2..791cb44 100644 --- a/app/static/css/form.css +++ b/app/static/css/form.css @@ -1,5 +1,5 @@ .form .avatar { - width: 150px; height: 150px; + width: 128px; height: 128px; } .form .avatar + input[type="file"] { diff --git a/app/static/css/global.css b/app/static/css/global.css index fc8fbe7..6deb3bb 100644 --- a/app/static/css/global.css +++ b/app/static/css/global.css @@ -1,8 +1,6 @@ /* Fonts */ @font-face { font-family: NotoSans; src: url(../fonts/noto_sans.ttf); } -@font-face { font-family: Raleway; font-weight: 200; src: url(../fonts/raleway_200.ttf); } -@font-face { font-family: Raleway; font-weight: 300; src: url(../fonts/raleway_300.ttf); } @font-face { font-family: Cantarell; font-weight: normal; src: url(../fonts/Cantarell-Regular.otf); } @font-face { font-family: Cantarell; font-weight: bold; src: url(../fonts/Cantarell-Bold.otf); } diff --git a/app/static/css/light.css b/app/static/css/light.css index 05a073f..3529828 100644 --- a/app/static/css/light.css +++ b/app/static/css/light.css @@ -82,26 +82,17 @@ } #menu h2 { margin: 10px 0 10px 40px; - font-family: Raleway; font-size: 15px; - color: #ffffff; + font-size: 15px; } #menu h2 > svg { - width: 30px; vertical-align: middle; -} -#menu h2 > img { - width: 64px; margin-right: 10px; - vertical-align: middle; border-radius: 50%; + width: 30px; } #menu h3 { margin: 10px 0 10px 40px; - font-family: Raleway; font-size: 13px; - color: #ffffff; } #menu hr { margin: 10px 15px 0 15px; - border: none; - border-bottom: 1px solid rgba(0, 0, 0, .15); } #menu > div > a, @@ -117,14 +108,6 @@ margin: 0; font-style: normal; font-size: 12px; } -#menu a > img { - vertical-align: middle; - margin-right: 15px; -} -#menu a > svg { - width: 20px; height: 20px; vertical-align: middle; - margin-right: 10px; -} #menu ul { list-style: none; margin: 10px 15px; padding: 0; diff --git a/app/static/css/navbar.css b/app/static/css/navbar.css index a6c878c..7288ee0 100644 --- a/app/static/css/navbar.css +++ b/app/static/css/navbar.css @@ -129,7 +129,7 @@ nav a:focus { #menu h2 { margin: 5% 0 20px 40px; - font-family: Raleway; font-size: 18px; + font-family: Cantarell; font-weight: normal; font-size: 19px; color: #ffffff; } #menu h2 a { @@ -140,7 +140,7 @@ nav a:focus { font-size: inherit; opacity: inherit; } #menu h2 > svg { - width: 42px; vertical-align: middle; + width: 42px; vertical-align: middle; margin-right: 8px; } #menu h2 img { width: 64px; border-radius: 2px; vertical-align: middle; margin-right: 10px; @@ -152,7 +152,7 @@ nav a:focus { #menu h3 { margin: 20px 0 20px 40px; - font-family: Raleway; font-size: 14px; + font-family: Cantarell; font-weight: normal; font-size: 15px; color: #ffffff; } #menu hr { diff --git a/app/static/fonts/raleway_200.ttf b/app/static/fonts/raleway_200.ttf deleted file mode 100644 index 281a001..0000000 Binary files a/app/static/fonts/raleway_200.ttf and /dev/null differ diff --git a/app/static/fonts/raleway_300.ttf b/app/static/fonts/raleway_300.ttf deleted file mode 100644 index 9ff67e7..0000000 Binary files a/app/static/fonts/raleway_300.ttf and /dev/null differ diff --git a/app/templates/base/navbar/account.html b/app/templates/base/navbar/account.html index 6ab5fe1..1d5bb53 100644 --- a/app/templates/base/navbar/account.html +++ b/app/templates/base/navbar/account.html @@ -9,26 +9,22 @@ - - Notifications + Notifications - - Trophées + Trophées - - Topics favoris + Topics favoris - - Panel d'administration + Panel d'administration
@@ -36,21 +32,17 @@ - - Paramètres + Paramètres - - Déconnexion + Déconnexion {% else %}
-

- Invité -

+

Invité

{{ login_form.hidden_tag() }} {{ login_form.username(size=32, placeholder="Identifiant") }} diff --git a/app/templates/base/navbar/programs.html b/app/templates/base/navbar/programs.html index 8919553..c9570e1 100644 --- a/app/templates/base/navbar/programs.html +++ b/app/templates/base/navbar/programs.html @@ -2,32 +2,27 @@

- - Programmes + Programmes

- - Jeux + Jeux - - Utilitaires + Utilitaires - - Logiciels + Logiciels - - Top 20 + Top 20
@@ -35,8 +30,7 @@ - - Recherche avancée + Recherche avancée
diff --git a/app/templates/base/navbar/tools.html b/app/templates/base/navbar/tools.html index 1f08e77..fc9c4e2 100644 --- a/app/templates/base/navbar/tools.html +++ b/app/templates/base/navbar/tools.html @@ -2,26 +2,22 @@

- - Outils + Outils

- - Forge GitLab + Forge Gitea - - Casio Universal Wiki + Casio Universal Wiki - - SH4 Compatibility Tool + SH4 Compatibility Tool
diff --git a/app/templates/user.html b/app/templates/user.html index 8f01820..e1cc82a 100644 --- a/app/templates/user.html +++ b/app/templates/user.html @@ -1,9 +1,14 @@ {% extends "base/base.html" %} +{% block title %} +

Profil de '{{ user.name }}'

+{% endblock %} + {% block content %}
-

+
{{ user.name }} - Profil de {{ user.name }}

+ {{ user.name }} +
{% endblock %}