From 1e4171ddca2a9eabe772662aec816737bbd0af03 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Thu, 19 Sep 2019 15:02:48 +0530 Subject: [PATCH 1/9] Update ProjectInfoContainer.scss --- src/projects/detail/containers/ProjectInfoContainer.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/projects/detail/containers/ProjectInfoContainer.scss b/src/projects/detail/containers/ProjectInfoContainer.scss index a12ee6fe4..4ff60fb5a 100644 --- a/src/projects/detail/containers/ProjectInfoContainer.scss +++ b/src/projects/detail/containers/ProjectInfoContainer.scss @@ -59,6 +59,7 @@ justify-content: center; margin-top: 20px; padding: 5px 0; + position: relative; :global { .panel { From 9a4a218547f31ea80f153a6f57dbbf40fbafaf94 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Sat, 21 Sep 2019 22:00:41 +0530 Subject: [PATCH 2/9] Update ProjectStatusChangeConfirmation.scss --- .../ProjectStatus/ProjectStatusChangeConfirmation.scss | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss index 8fd19c05e..3dab005bf 100644 --- a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss +++ b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss @@ -11,6 +11,7 @@ &.modal{ position: absolute; + top: 30px; } .cancellation-reason { @@ -35,11 +36,6 @@ width: 100%; } } - - &.dropdown-up { - top: auto; - bottom: 320px; - } } } - \ No newline at end of file + From 8e4d9dea661bd3da3eeb734dcffe0ee1efda841b Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Tue, 24 Sep 2019 22:04:54 +0530 Subject: [PATCH 3/9] Update ProjectStatusChangeConfirmation.scss --- .../ProjectStatus/ProjectStatusChangeConfirmation.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss index 3dab005bf..f943c75a3 100644 --- a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss +++ b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss @@ -10,7 +10,6 @@ z-index: 20; &.modal{ - position: absolute; top: 30px; } From 3000c6336d5d1929b3cca89d6954141f8f0b8705 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Tue, 24 Sep 2019 22:07:39 +0530 Subject: [PATCH 4/9] Update ProjectStatus.scss --- src/components/ProjectStatus/ProjectStatus.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/ProjectStatus/ProjectStatus.scss b/src/components/ProjectStatus/ProjectStatus.scss index b0cebe28b..4a6ae7dd2 100644 --- a/src/components/ProjectStatus/ProjectStatus.scss +++ b/src/components/ProjectStatus/ProjectStatus.scss @@ -45,6 +45,13 @@ } } + .dropdown-wrap { + .status-header { + display: flex; + justify-content: center; + } + } + .status-label { vertical-align: top; } From 654f6ef57f181b4458f0324f89e62f171677dc2b Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Wed, 25 Sep 2019 20:36:48 +0530 Subject: [PATCH 5/9] Update ProjectStatus.scss --- src/components/ProjectStatus/ProjectStatus.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/ProjectStatus/ProjectStatus.scss b/src/components/ProjectStatus/ProjectStatus.scss index 4a6ae7dd2..38ee57c1a 100644 --- a/src/components/ProjectStatus/ProjectStatus.scss +++ b/src/components/ProjectStatus/ProjectStatus.scss @@ -47,8 +47,12 @@ .dropdown-wrap { .status-header { - display: flex; - justify-content: center; + &.status-active { + &.editable { + display: flex; + justify-content: center; + } + } } } From eed1d81a58f38a51ada3d0049c424f0cc820583a Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Wed, 25 Sep 2019 20:38:02 +0530 Subject: [PATCH 6/9] Update ProjectInfoContainer.scss --- src/projects/detail/containers/ProjectInfoContainer.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/projects/detail/containers/ProjectInfoContainer.scss b/src/projects/detail/containers/ProjectInfoContainer.scss index 4ff60fb5a..a12ee6fe4 100644 --- a/src/projects/detail/containers/ProjectInfoContainer.scss +++ b/src/projects/detail/containers/ProjectInfoContainer.scss @@ -59,7 +59,6 @@ justify-content: center; margin-top: 20px; padding: 5px 0; - position: relative; :global { .panel { From ca9f5c3a46d4808e5f54b1c7f30ec403714e9807 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Wed, 25 Sep 2019 20:38:35 +0530 Subject: [PATCH 7/9] Update ProjectStatusChangeConfirmation.scss --- .../ProjectStatus/ProjectStatusChangeConfirmation.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss index f943c75a3..35523fd4a 100644 --- a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss +++ b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss @@ -10,7 +10,6 @@ z-index: 20; &.modal{ - top: 30px; } .cancellation-reason { From 363e1ea7b7a985ba65d3d38b18ef42d778d9a411 Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Mon, 30 Sep 2019 22:33:00 +0530 Subject: [PATCH 8/9] Update ProjectStatusChangeConfirmation.scss --- .../ProjectStatus/ProjectStatusChangeConfirmation.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss index 35523fd4a..148398bad 100644 --- a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss +++ b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.scss @@ -34,6 +34,11 @@ width: 100%; } } + + &.dropdown-up { + top: auto; + bottom: 320px; + } } } From ca44a54ca4a5003970a6cd6f9a1df776d0d0fceb Mon Sep 17 00:00:00 2001 From: PrakashDurlabhji Date: Mon, 30 Sep 2019 23:25:46 +0530 Subject: [PATCH 9/9] Update ProjectStatusChangeConfirmation.jsx --- .../ProjectStatus/ProjectStatusChangeConfirmation.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.jsx b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.jsx index a29abb354..e0775d0d7 100644 --- a/src/components/ProjectStatus/ProjectStatusChangeConfirmation.jsx +++ b/src/components/ProjectStatus/ProjectStatusChangeConfirmation.jsx @@ -79,7 +79,7 @@ class ProjectStatusChangeConfirmation extends Component { const { newStatus, onCancel } = this.props this.shouldDropdownUp() return ( -
{ if (input && ! this.wrapper){this.wrapper = input; this.setState({showUp:this.shouldDropdownUp()}) }}} onClick={e => e.stopPropagation()} >