Merge pull request #114 from finnlabs/fix/24874-two-scrollbars-displayed-in-cost-report

[24874] Two scrollbars displayed in cost report
pull/6827/head
Henriette Dinger 8 years ago committed by GitHub
commit e8925f5bed
  1. 6
      app/assets/stylesheets/reporting/reporting.css.sass
  2. 10
      lib/widget/entry_table.rb

@ -20,3 +20,9 @@
&:after &:after
@include sort-icons @include sort-icons
content: "\e09f" content: "\e09f"
#result-table .generic-table--results-container tfoot
td
width: 150px
.generic-table--footer-outer
width: inherit

@ -96,20 +96,20 @@ class Widget::Table::EntryTable < Widget::Table
content_tag :tfoot do content_tag :tfoot do
content_tag :tr do content_tag :tr do
if show_result(@subject, 0) != show_result(@subject) if show_result(@subject, 0) != show_result(@subject)
concat content_tag(:th, '', colspan: FIELDS.size) concat content_tag(:td, '', colspan: FIELDS.size)
concat content_tag(:th) { concat content_tag(:td) {
concat content_tag(:div, concat content_tag(:div,
show_result(@subject), show_result(@subject),
class: 'inner generic-table--footer-outer') class: 'inner generic-table--footer-outer')
} }
concat content_tag(:th) { concat content_tag(:td) {
concat content_tag(:div, concat content_tag(:div,
show_result(@subject, 0), show_result(@subject, 0),
class: 'result generic-table--footer-outer') class: 'result generic-table--footer-outer')
} }
else else
concat content_tag(:th, '', colspan: FIELDS.size + 1) concat content_tag(:td, '', colspan: FIELDS.size + 1)
concat content_tag(:th) { concat content_tag(:td) {
concat content_tag(:div, concat content_tag(:div,
show_result(@subject), show_result(@subject),
class: 'result generic-table--footer-outer') class: 'result generic-table--footer-outer')

Loading…
Cancel
Save