Skip to content

issue 3206 fix #3307

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
maxceem merged 9 commits into from
Oct 1, 2019
Merged

issue 3206 fix #3307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e4171d
Update ProjectInfoContainer.scss
PrakashDurlabhji Sep 19, 2019
9a4a218
Update ProjectStatusChangeConfirmation.scss
PrakashDurlabhji Sep 21, 2019
8e4d9de
Update ProjectStatusChangeConfirmation.scss
PrakashDurlabhji Sep 24, 2019
3000c63
Update ProjectStatus.scss
PrakashDurlabhji Sep 24, 2019
654f6ef
Update ProjectStatus.scss
PrakashDurlabhji Sep 25, 2019
eed1d81
Update ProjectInfoContainer.scss
PrakashDurlabhji Sep 25, 2019
ca9f5c3
Update ProjectStatusChangeConfirmation.scss
PrakashDurlabhji Sep 25, 2019
363e1ea
Update ProjectStatusChangeConfirmation.scss
PrakashDurlabhji Sep 30, 2019
ca44a54
Update ProjectStatusChangeConfirmation.jsx
PrakashDurlabhji Sep 30, 2019
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
11 changes: 11 additions & 0 deletions src/components/ProjectStatus/ProjectStatus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@
}
}

.dropdown-wrap {
.status-header {
&.status-active {
&.editable {
display: flex;
justify-content: center;
}
}
}
}

.status-label {
vertical-align: top;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectStatus/ProjectStatusChangeConfirmation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class ProjectStatusChangeConfirmation extends Component {
const { newStatus, onCancel } = this.props
this.shouldDropdownUp()
return (
<div className={cn('modal', 'project-status-change-modal', { 'dropdown-up': this.state.showUp })}
<div className={cn('modal', 'project-status-change-modal')}
ref={(input) => { if (input && ! this.wrapper){this.wrapper = input; this.setState({showUp:this.shouldDropdownUp()}) }}}
onClick={e => e.stopPropagation()}
>
Expand Down
5 changes: 2 additions & 3 deletions src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
z-index: 20;

&.modal{
position: absolute;
}

.cancellation-reason {
Expand All @@ -35,11 +34,11 @@
width: 100%;
}
}

&.dropdown-up {
top: auto;
bottom: 320px;
}
}
}