Skip to content

Hotfix/fixed reverted change timeline header #2616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RishiRajSahu merged 2 commits into from
Oct 11, 2018
Merged

Hotfix/fixed reverted change timeline header #2616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c79805f
Hotfix for changed which got reverted during previous merge
RishiRajSahu Oct 11, 2018
f3b00ee
Removed unused Import
RishiRajSahu Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/projects/detail/components/timeline/Milestone/Milestone.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class Milestone extends React.Component {
<div styleName="timeline-post">
{(<div styleName={'background ' + ((this.state.isHoverHeader && !this.state.isEditing && !isCompleted) ? 'hover ': '')} />)}
<div styleName="col-date">
<div styleName={(isCompleted ? 'completed' : 'planned' )}>
<div styleName={(isCompleted || isActive ? 'completed' : 'planned' )}>
<div styleName="month">{month}</div>
<div styleName="day">{date}</div>
</div>
Expand Down
7 changes: 0 additions & 7 deletions src/projects/detail/components/timeline/Timeline/Timeline.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import React from 'react'
import PT from 'prop-types'
import _ from 'lodash'

import TimelineHeader from '../TimelineHeader'
import Milestone from '../Milestone'
import LoadingIndicator from '../../../../../components/LoadingIndicator/LoadingIndicator'

Expand Down Expand Up @@ -104,12 +103,6 @@ class Timeline extends React.Component {
const orderedMilestones = timeline.milestones ? _.orderBy(timeline.milestones, ['order']) : []
return (
<div ref={ div => { this.div = div } }>
<TimelineHeader
postContent={{
title: timeline.name,
postMsg: timeline.description,
}}
/>
{_.reject(orderedMilestones, { hidden: true }).map((milestone) => (
<Milestone
key={milestone.id}
Expand Down