From 606b3a4d88d5536c8a812bc8a4d7213a2f404eb9 Mon Sep 17 00:00:00 2001 From: Paul van Tilburg Date: Mon, 9 Jan 2012 17:14:54 +0100 Subject: [PATCH] Tweaked style and layout of the invoice form view --- stoptime.rb | 12 +++++++++--- templates/sass/style.sass | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/stoptime.rb b/stoptime.rb index 094bb57..5c89eb8 100644 --- a/stoptime.rb +++ b/stoptime.rb @@ -1741,7 +1741,13 @@ module StopTime::Views subtotal += line[2] task.time_entries.each do |entry| tr do - td.indent { "– #{entry.comment}" } + td.indent do + if entry.comment.present? + "• #{entry.comment}" + else + em.light "• no comment" + end + end td.right { "%.2fh" % entry.hours_total } td.right { "–" } td.right { "–" } @@ -1751,7 +1757,7 @@ module StopTime::Views if @company.vatno.blank? vat = 0 else - tr do + tr.total do td { i "Sub-total" } td "" td "" @@ -1766,7 +1772,7 @@ module StopTime::Views end end tr.total do - td { b "Total amount" } + td { b "Total" } td "" td "" td.right { "€ %.2f" % (subtotal + vat) } diff --git a/templates/sass/style.sass b/templates/sass/style.sass index 363921e..d8119de 100644 --- a/templates/sass/style.sass +++ b/templates/sass/style.sass @@ -6,6 +6,7 @@ $medium-grey: #cfcfcf $dark-grey: #9f9f9f $light-red: #cb0000 $dark-red: #990000 +$white: #ffffff /* General classes */ .right @@ -22,6 +23,9 @@ $dark-red: #990000 .billed text-decoration: line-through +.light + color: $medium-grey + .indent padding-left: 20px @@ -106,6 +110,9 @@ table &:hover background-color: $medium-grey + .light + color: white + &.total border-top: thin solid black