Merge pull request #281 from bmic-development/jm-service-calendar-fre…

…eze-panes-misalignment JM- (SPARCRequest) Freeze panes - Step 2 calendar pages
sparc-request · May 24, 2017 · 306cc19 · 306cc19
2 parents 9e38362 + a246936
commit 306cc19
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/assets/stylesheets/service_calendar.sass b/app/assets/stylesheets/service_calendar.sass
@@ -54,7 +54,7 @@
       font-size: 19px
       display: block
     .top-icon
-      color: #add8e6
+      color: #F79739
       height: 7px
       overflow: hidden
     .bottom-icon
@@ -132,7 +132,8 @@
         width: 14.5%
       th.visit-width
         width: 6.9%
-      th.total-one-time-fee-width
+      th.total-one-time-fee-width,
+      th.total-direct-one-time-fee-width
         width: 90.75%
       td.service-name
         width: 17%
@@ -187,7 +188,8 @@
         width: 41.6%
       .billing-organization-header-end-width
         width: 14.7%
-      .total-one-time-fee-width
+      .total-one-time-fee-width,
+      .total-direct-one-time-fee-width
         width: 90.8%
 
 .service-calendar-row,

diff --git a/app/views/service_calendars/master_calendar/otf/_otf_totals.html.haml b/app/views/service_calendars/master_calendar/otf/_otf_totals.html.haml
@@ -19,7 +19,7 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 - if USE_INDIRECT_COST
   %tr.total-direct-one-time-fee-cost-per-study
-    %th{ colspan: 10 }
+    %th.total-direct-one-time-fee-width{ colspan: 10 }
       = t(:calendars)[:otf][:totals][:total_direct]
     %td.text-center
       %strong

diff --git a/app/views/service_calendars/master_calendar/pppv/_pppv_totals.html.haml b/app/views/service_calendars/master_calendar/pppv/_pppv_totals.html.haml
@@ -23,7 +23,7 @@
       %strong
         = t(:calendars)[:pppv][:totals][:maximum_direct]
     - 5.times do |i|
-      %td.text-center{ class: "max-direct-per-patient visit-#{i+1}" }
+      %td.text-center.visit-width{ class: "max-direct-per-patient visit-#{i+1}" }
         %strong
     %td.text-center.total-width
       %strong