Merge remote-tracking branch 'op/timeline' into timeline

pull/5162/head
Roman Roelofsen 8 years ago
commit bbf942feb2
  1. 2
      app/assets/stylesheets/content/work_packages/timelines/_timelines.sass
  2. 2
      frontend/app/components/wp-table/wp-table.directive.html

@ -4,7 +4,7 @@
.wp-timeline--dummy-controls
position: absolute
right: 5px
right: 20px
background: white
top: calc(#{$generic-table--header-height} + 10px)
z-index: 101

@ -3,6 +3,7 @@
<div class="generic-table--results-container"
wp-virtual-scroll-table>
<timeline-control></timeline-control>
<table interactive-table class="keyboard-accessible-list generic-table work-package-table">
<colgroup>
<col highlight-col />
@ -46,7 +47,6 @@
<div class="wp-timeline--slider"></div>
</div>
<div class="wp-timeline-header-container generic-table--sort-header-outer">
<timeline-control></timeline-control>
<div class="wp-timeline--scroll-wrapper">
<span class="generic-table--sort-header wp-timeline-header">
</span>

Loading…
Cancel
Save