Tweaked style and layout of the invoice form view
This commit is contained in:
parent
7cd58f019e
commit
606b3a4d88
2 changed files with 16 additions and 3 deletions
12
stoptime.rb
12
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) }
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue