diff --git a/ihatemoney/static/css/main.css b/ihatemoney/static/css/main.css index 574baa38..8667f231 100644 --- a/ihatemoney/static/css/main.css +++ b/ihatemoney/static/css/main.css @@ -87,6 +87,16 @@ body { height: 100%; color: black; overflow-y: auto; + display: flex; + flex-direction: column; +} + +.sidebar_content { + flex: 1 1 auto; + overflow-y: auto; +} +.identifier { + margin-bottom: 15px; } @media (min-width: 768px) { @@ -94,6 +104,11 @@ body { position: fixed; padding-bottom: 4.5rem; } + + .identifier { + margin-bottom: 0; + } + } #add-member-form { @@ -241,14 +256,9 @@ footer .footer-left { } } -.identifier { - float: right; -} - -#new-bill, -.identifier { - margin-top: 16px; - margin-bottom: 16px; +#new-bill { + margin-top: 30px; + margin-bottom: 30px; } /* Avoid text color flickering when it loose focus as the modal appears */ @@ -441,6 +451,7 @@ tr:hover .extra-info { display: inline-block; border-bottom: 0.2em solid transparent; height: 1.2em; + width: 1.2em; /* protection for IE11 */ } .download-project .icon svg { @@ -453,3 +464,6 @@ tr:hover .extra-info { footer .icon svg { fill: white; } +.icon.icon-white { + fill: white; +} \ No newline at end of file diff --git a/ihatemoney/static/images/paper-plane.svg b/ihatemoney/static/images/paper-plane.svg new file mode 100644 index 00000000..cecb40f2 --- /dev/null +++ b/ihatemoney/static/images/paper-plane.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ihatemoney/templates/forms.html b/ihatemoney/templates/forms.html index 57f9440b..a64e2055 100644 --- a/ihatemoney/templates/forms.html +++ b/ihatemoney/templates/forms.html @@ -1,4 +1,4 @@ -{% macro input(field, multiple=False, class='form-control', inline=False) -%} +{% macro input(field, multiple=False, class='form-control', inline=False, placeholder='') -%}
{% if field.type != "SubmitField" %} {% if inline %} @@ -9,9 +9,9 @@ {% endif %}
{% if multiple == True %} - {{ field(multiple=True, class=class) }} + {{ field(multiple=True, class=class, placeholder=placeholder) }} {% else %} - {{ field(class=class) | safe }} + {{ field(class=class, placeholder=placeholder) | safe }} {% endif %} {% if field.description %}

{{ field.description }}

@@ -119,8 +119,8 @@ {{ form.hidden_tag() }} {% include "display_errors.html" %}
- - {{ form.name(placeholder=_("Type user name here"), class="form-control") }} + + {{ form.name(placeholder=_("Add participant"), class="form-control") }}
@@ -143,10 +143,9 @@ {% macro invites(form) %} {{ form.hidden_tag() }} - {{ input(form.emails) }} + {{ input(form.emails, placeholder=_('john.doe@example.com, mary.moe@site.com')) }}
- {{ _("No, thanks") }}
{% endmacro %} diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html index 6ccf0a0f..367d2ee5 100644 --- a/ihatemoney/templates/list_bills.html +++ b/ihatemoney/templates/list_bills.html @@ -45,43 +45,52 @@ {% endblock %} {% block sidebar %} -
- {{ forms.add_member(member_form) }} -
+