Skip to content

Commit 34a793f

Browse files
authored
Merge pull request #2616 from appirio-tech/hotfix/Fixed_reverted_change_timeline_header
Hotfix/fixed reverted change timeline header
2 parents 98f3747 + f3b00ee commit 34a793f

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

src/projects/detail/components/timeline/Milestone/Milestone.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class Milestone extends React.Component {
175175
<div styleName="timeline-post">
176176
{(<div styleName={'background ' + ((this.state.isHoverHeader && !this.state.isEditing && !isCompleted) ? 'hover ': '')} />)}
177177
<div styleName="col-date">
178-
<div styleName={(isCompleted ? 'completed' : 'planned' )}>
178+
<div styleName={(isCompleted || isActive ? 'completed' : 'planned' )}>
179179
<div styleName="month">{month}</div>
180180
<div styleName="day">{date}</div>
181181
</div>

src/projects/detail/components/timeline/Timeline/Timeline.jsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import React from 'react'
55
import PT from 'prop-types'
66
import _ from 'lodash'
77

8-
import TimelineHeader from '../TimelineHeader'
98
import Milestone from '../Milestone'
109
import LoadingIndicator from '../../../../../components/LoadingIndicator/LoadingIndicator'
1110

@@ -104,12 +103,6 @@ class Timeline extends React.Component {
104103
const orderedMilestones = timeline.milestones ? _.orderBy(timeline.milestones, ['order']) : []
105104
return (
106105
<div ref={ div => { this.div = div } }>
107-
<TimelineHeader
108-
postContent={{
109-
title: timeline.name,
110-
postMsg: timeline.description,
111-
}}
112-
/>
113106
{_.reject(orderedMilestones, { hidden: true }).map((milestone) => (
114107
<Milestone
115108
key={milestone.id}

0 commit comments

Comments
 (0)