Tweaked style and layout of the invoice form view

This commit is contained in:
Paul van Tilburg 2012-01-09 17:14:54 +01:00
parent 7cd58f019e
commit 606b3a4d88
2 changed files with 16 additions and 3 deletions

View File

@ -1741,7 +1741,13 @@ module StopTime::Views
subtotal += line[2] subtotal += line[2]
task.time_entries.each do |entry| task.time_entries.each do |entry|
tr do 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 { "%.2fh" % entry.hours_total }
td.right { "" } td.right { "" }
td.right { "" } td.right { "" }
@ -1751,7 +1757,7 @@ module StopTime::Views
if @company.vatno.blank? if @company.vatno.blank?
vat = 0 vat = 0
else else
tr do tr.total do
td { i "Sub-total" } td { i "Sub-total" }
td "" td ""
td "" td ""
@ -1766,7 +1772,7 @@ module StopTime::Views
end end
end end
tr.total do tr.total do
td { b "Total amount" } td { b "Total" }
td "" td ""
td "" td ""
td.right { "€ %.2f" % (subtotal + vat) } td.right { "€ %.2f" % (subtotal + vat) }

View File

@ -6,6 +6,7 @@ $medium-grey: #cfcfcf
$dark-grey: #9f9f9f $dark-grey: #9f9f9f
$light-red: #cb0000 $light-red: #cb0000
$dark-red: #990000 $dark-red: #990000
$white: #ffffff
/* General classes */ /* General classes */
.right .right
@ -22,6 +23,9 @@ $dark-red: #990000
.billed .billed
text-decoration: line-through text-decoration: line-through
.light
color: $medium-grey
.indent .indent
padding-left: 20px padding-left: 20px
@ -106,6 +110,9 @@ table
&:hover &:hover
background-color: $medium-grey background-color: $medium-grey
.light
color: white
&.total &.total
border-top: thin solid black border-top: thin solid black