Skip to content

Commit 9e64a70

Browse files
maxceemmaxceem
committed
issue #2273 - MilestoneTypeFinalDesigns milestone: everything takes the whole width on mobile screens when milestone is inReview or isCompleted
1 parent 8060869 commit 9e64a70

File tree

2 files changed

+78
-79
lines changed

2 files changed

+78
-79
lines changed

‎src/projects/detail/components/timeline/milestones/MilestoneTypeFinalDesigns/MilestoneTypeFinalDesigns.jsx‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -350,90 +350,90 @@ class MilestoneTypeFinalDesigns extends React.Component {
350350
</div>
351351
</DotIndicator>
352352
))}
353-
</div>
354-
)}
355353

356-
{isSelectWarningVisible && (
357-
<DotIndicator hideLine>
358-
<div styleName="top-space">
359-
<div styleName="message-bar" className="flex center">
360-
<i>Please select all {minCheckedDesigns} places to complete the review</i>
361-
</div>
362-
</div>
363-
</DotIndicator>
364-
)}
354+
{isSelectWarningVisible && (
355+
<DotIndicator hideLine>
356+
<div styleName="top-space">
357+
<div styleName="message-bar" className="flex center">
358+
<i>Please select all {minCheckedDesigns} places to complete the review</i>
359+
</div>
360+
</div>
361+
</DotIndicator>
362+
)}
365363

366-
{!!extensionRequestDialog && (
367-
<DotIndicator hideLine>
368-
<div styleName="top-space">
369-
{extensionRequestDialog}
370-
</div>
371-
</DotIndicator>
372-
)}
364+
{!!extensionRequestDialog && (
365+
<DotIndicator hideLine>
366+
<div styleName="top-space">
367+
{extensionRequestDialog}
368+
</div>
369+
</DotIndicator>
370+
)}
373371

374-
{!!extensionRequestConfirmation && (
375-
<DotIndicator hideLine>
376-
<div styleName="top-space">
377-
{extensionRequestConfirmation}
378-
</div>
379-
</DotIndicator>
380-
)}
372+
{!!extensionRequestConfirmation && (
373+
<DotIndicator hideLine>
374+
<div styleName="top-space">
375+
{extensionRequestConfirmation}
376+
</div>
377+
</DotIndicator>
378+
)}
381379

382-
{
383-
!isCompleted &&
384-
!extensionRequestDialog &&
385-
!isShowCompleteConfirmMessage &&
386-
!isShowCustomerCompleteConfirmMessage &&
387-
(!currentUser.isCustomer || isInReview) &&
388-
(
389-
<DotIndicator hideLine>
390-
<div styleName="action-bar" className="flex center">
391-
{(!currentUser.isCustomer || isInReview) && (
392-
<button
393-
className={'tc-btn tc-btn-primary'}
394-
onClick={!currentUser.isCustomer ? this.showCompleteReviewConfirmation : this.showCustomerCompleteReviewConfirmation}
395-
disabled={!isInReview}
396-
>
397-
Complete review ({hoursLeft}h)
398-
</button>
399-
)}
400-
{!currentUser.isCustomer && extensionRequestButton}
401-
</div>
402-
</DotIndicator>
403-
)}
380+
{
381+
!isCompleted &&
382+
!extensionRequestDialog &&
383+
!isShowCompleteConfirmMessage &&
384+
!isShowCustomerCompleteConfirmMessage &&
385+
(!currentUser.isCustomer || isInReview) &&
386+
(
387+
<DotIndicator hideLine>
388+
<div styleName="action-bar" className="flex center">
389+
{(!currentUser.isCustomer || isInReview) && (
390+
<button
391+
className={'tc-btn tc-btn-primary'}
392+
onClick={!currentUser.isCustomer ? this.showCompleteReviewConfirmation : this.showCustomerCompleteReviewConfirmation}
393+
disabled={!isInReview}
394+
>
395+
Complete review ({hoursLeft}h)
396+
</button>
397+
)}
398+
{!currentUser.isCustomer && extensionRequestButton}
399+
</div>
400+
</DotIndicator>
401+
)}
404402

405-
{isShowCompleteConfirmMessage && (
406-
<DotIndicator hideLine>
407-
<div styleName="top-space">
408-
<MilestonePostMessage
409-
label={'Complete milestone review'}
410-
theme="warning"
411-
message={'Warning! Complete the review only if you have the permission from the customer. We do not want to close the review early without the ability to get feedback from our customers and let them select the winning 5 designs for next round.'}
412-
isShowSelection={false}
413-
buttons={[
414-
{ title: 'Cancel', onClick: this.hideCompleteReviewConfirmation, type: 'default' },
415-
{ title: 'Complete review', onClick: this.completeReview, type: 'warning' },
416-
]}
417-
/>
418-
</div>
419-
</DotIndicator>
420-
)}
403+
{isShowCompleteConfirmMessage && (
404+
<DotIndicator hideLine>
405+
<div styleName="top-space">
406+
<MilestonePostMessage
407+
label={'Complete milestone review'}
408+
theme="warning"
409+
message={'Warning! Complete the review only if you have the permission from the customer. We do not want to close the review early without the ability to get feedback from our customers and let them select the winning 5 designs for next round.'}
410+
isShowSelection={false}
411+
buttons={[
412+
{ title: 'Cancel', onClick: this.hideCompleteReviewConfirmation, type: 'default' },
413+
{ title: 'Complete review', onClick: this.completeReview, type: 'warning' },
414+
]}
415+
/>
416+
</div>
417+
</DotIndicator>
418+
)}
421419

422-
{isShowCustomerCompleteConfirmMessage && (
423-
<DotIndicator hideLine>
424-
<div styleName="top-space">
425-
<MilestonePostMessage
426-
label="Design phase competition"
427-
theme="primary"
428-
message="This selection is final and cannot be undone. Once you confirm your selection we will close the design phase and can proceed to the next one. Clicking on the Confirm selection button would make the source files available for download."
429-
isShowSelection={false}
430-
buttons={[
431-
{ title: 'Cancel', onClick: this.hideCustomerCompleteReviewConfirmation, type: 'default' },
432-
{ title: 'Complete selection', onClick: this.completeReview, type: 'primary' },
433-
]}
434-
/>
435-
</div>
436-
</DotIndicator>
420+
{isShowCustomerCompleteConfirmMessage && (
421+
<DotIndicator hideLine>
422+
<div styleName="top-space">
423+
<MilestonePostMessage
424+
label="Design phase competition"
425+
theme="primary"
426+
message="This selection is final and cannot be undone. Once you confirm your selection we will close the design phase and can proceed to the next one. Clicking on the Confirm selection button would make the source files available for download."
427+
isShowSelection={false}
428+
buttons={[
429+
{ title: 'Cancel', onClick: this.hideCustomerCompleteReviewConfirmation, type: 'default' },
430+
{ title: 'Complete selection', onClick: this.completeReview, type: 'primary' },
431+
]}
432+
/>
433+
</div>
434+
</DotIndicator>
435+
)}
436+
</div>
437437
)}
438438
</div>
439439
)}

‎src/projects/detail/components/timeline/milestones/MilestoneTypeFinalDesigns/MilestoneTypeFinalDesigns.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
display: flex;
111111
flex-wrap: wrap;
112112
padding-top: $base-unit;
113-
padding-bottom: $base-unit;
114113
position: relative;
115114

116115
button {

0 commit comments

Comments
 (0)