From 9c9f4fc6669cd1501e9d9709e87150712fc5e142 Mon Sep 17 00:00:00 2001 From: Jojo144 Date: Sat, 21 Mar 2020 00:10:15 +0100 Subject: [PATCH] Ajoute un bonhomme qui lit sur la page d'accueil FR + un bouton 'Afficher BD' sur page list_bills FR --- ihatemoney/static/css/main.css | 15 +++++-- ihatemoney/static/images/read.svg | 55 ++++++++++++++++++++++++++ ihatemoney/templates/edit_project.html | 8 ++-- ihatemoney/templates/home.html | 2 +- ihatemoney/templates/layout.html | 2 +- ihatemoney/templates/list_bills.html | 10 ++++- 6 files changed, 81 insertions(+), 11 deletions(-) create mode 100644 ihatemoney/static/images/read.svg diff --git a/ihatemoney/static/css/main.css b/ihatemoney/static/css/main.css index 1faec871..258c97e8 100644 --- a/ihatemoney/static/css/main.css +++ b/ihatemoney/static/css/main.css @@ -54,6 +54,8 @@ body { color: #fff; background-color: #414141; border-color: #414141; + margin-left: 3px; + margin-right: 3px; } #header .tryout:hover, #header .showcase:hover { @@ -63,8 +65,9 @@ body { } #header .showcaseimg { - width: 100px; - margin-left: 20px; + width: 36px; + margin-left: 5px; + margin-bottom: 8px; } #header .additional-content { @@ -502,11 +505,17 @@ tr:hover .extra-info { width: 1.2em; /* protection for IE11 */ } +.icon.high svg { + height: 2em; + margin-top: -0.2em; + margin-bottom: -0.2em; +} + .download-project .icon svg { fill: white; } -.icon.plus svg { +.icon.before-text svg { margin-right: 3px; } footer .icon svg { diff --git a/ihatemoney/static/images/read.svg b/ihatemoney/static/images/read.svg new file mode 100644 index 00000000..e35bf59e --- /dev/null +++ b/ihatemoney/static/images/read.svg @@ -0,0 +1,55 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + + + diff --git a/ihatemoney/templates/edit_project.html b/ihatemoney/templates/edit_project.html index dcbbbc86..3f70e40f 100644 --- a/ihatemoney/templates/edit_project.html +++ b/ihatemoney/templates/edit_project.html @@ -23,11 +23,11 @@ {{ _('Bill items') }} - {{ static_include("images/file-alt.svg") | safe }} + {{ static_include("images/file-alt.svg") | safe }} JSON - {{ static_include("images/file-csv-solid.svg") | safe }} + {{ static_include("images/file-csv-solid.svg") | safe }} CSV @@ -39,11 +39,11 @@ {{ _('Settle plans') }} - {{ static_include("images/file-alt.svg") | safe }} + {{ static_include("images/file-alt.svg") | safe }} JSON - {{ static_include("images/file-csv-solid.svg") | safe }} + {{ static_include("images/file-csv-solid.svg") | safe }} CSV diff --git a/ihatemoney/templates/home.html b/ihatemoney/templates/home.html index 183b9f1f..104b3753 100644 --- a/ihatemoney/templates/home.html +++ b/ihatemoney/templates/home.html @@ -11,7 +11,7 @@ {% endif %} {% if g.lang == 'fr' %} ou Voir la BD explicative - + {% endif %}
diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index 86cd0db9..382f3d91 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -94,7 +94,7 @@
+ {% if g.lang == 'fr' %} + + {{ static_include("images/read.svg") | safe }} + Voir la BD explicative + + {% endif %} - {{ static_include("images/paper-plane.svg") | safe }} + {{ static_include("images/paper-plane.svg") | safe }} {{ _("Invite people") }}
@@ -79,7 +85,7 @@ {% block content %} - {{ static_include("images/plus.svg") | safe }} + {{ static_include("images/plus.svg") | safe }} {{ _("Add a new bill") }}