From 04fa8d5b02a2429c03d8587f8d823f6abc168ae9 Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Tue, 9 Aug 2011 23:49:09 +0200 Subject: [PATCH] Styling stuff. Fixes #9 (Adds a menu) --- budget/static/main.css | 73 +++++++++++++++++++++----------- budget/templates/layout.html | 11 +++-- budget/templates/list_bills.html | 14 +++--- 3 files changed, 63 insertions(+), 35 deletions(-) diff --git a/budget/static/main.css b/budget/static/main.css index 8520d94..bd59b2a 100644 --- a/budget/static/main.css +++ b/budget/static/main.css @@ -7,39 +7,64 @@ @import url(http://fonts.googleapis.com/css?family=Just+Me+Again+Down+Here); +a { + color: #a45900; +} + #title{ margin-top: 10px; } -.container h1{ - text-align: center; - font-family: 'Lobster', arial, serif; -} - -.fleft{ - float: left; - margin-right: 20px; -} - -#content h2 { - font-weight: bold; - text-shadow: #DDD 2px 5px 2px; -} + #title h1{ + font-family: 'Lobster', arial, serif; + } #topmenu{ - margin-top: 15px; + margin-top: 30px; } -#topmenu ul{ - float: right; + #topmenu ul{ + float: right; + } + + #topmenu ul li{ + float: right; + list-style-type: none; + margin-left: 10px; + } + + +#leftmenu input{ + width: 150px; } -#topmenu ul li{ - float: right; + +.members { list-style-type: none; - margin-left: 10px; + margin: 0; + padding: 0; + width: 80%; } -/** links **/ -a { - color: #a45900; -} + .members li{ + padding: 5px; + } + + .members .odd{ + background-color: #efefef; + } + + .members .remove{ + float: right; + } + + .members .balance{ + margin-right: 10px; + font-weight: bold; + } + + .positive{ + color: green; + } + .negative{ + color: red; + } diff --git a/budget/templates/layout.html b/budget/templates/layout.html index 34e7f8b..19af8ca 100644 --- a/budget/templates/layout.html +++ b/budget/templates/layout.html @@ -8,13 +8,12 @@
-
-

Account manager ! Manage your shared expenses.

 -
-
- {% block top_menu %}{% endblock %} -
+ +
+ {% block top_menu %}{% endblock %}
+
{% for message in get_flashed_messages() %}
{{ message }}
{% endfor %} diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html index 6c0ac59..ad6cee9 100644 --- a/budget/templates/list_bills.html +++ b/budget/templates/list_bills.html @@ -2,23 +2,27 @@ {% block top_menu %} {% endblock %} {% block content %} -
-
    +
    +
      {% set balance = project.get_balance() %} {% for member in project.active_members %} -
    • {{ member.name }} {{ balance[member] }} x
      • +
    • + {{ balance[member] }} + {{ member.name }} + delete
      • {% endfor %}
    {{ forms.add_member(member_form) }}
    -
    +
    +Add a bill