From 6167802a1f3c8ea5c35c251cba5bb042eb805ee4 Mon Sep 17 00:00:00 2001
From: vimal1083 <vimal1083@gmail.com>
Date: Mon, 30 Nov 2020 19:47:04 +0530
Subject: [PATCH] Add line btw side blocks
---
.../src/app/src/components/SidebarBlock/index.js | 1 +
.../src/app/src/components/SidebarBlock/styles.scss | 7 +++++++
.../src/app/src/components/SubmissionLink/styles.scss | 1 -
.../static_src/src/app/src/containers/ReviewInformation.js | 2 --
.../src/app/src/containers/ScreeningStatus/index.js | 4 ++--
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hypha/static_src/src/app/src/components/SidebarBlock/index.js b/hypha/static_src/src/app/src/components/SidebarBlock/index.js
index 1bdd1b021..6d1252b3f 100644
--- a/hypha/static_src/src/app/src/components/SidebarBlock/index.js
+++ b/hypha/static_src/src/app/src/components/SidebarBlock/index.js
@@ -8,6 +8,7 @@ export const SidebarBlock = ({ title, children }) => {
<div className="sidebar-block">
{title && <h5>{title}</h5>}
{ children }
+ <div className="partition"> </div>
</div>
)
}
diff --git a/hypha/static_src/src/app/src/components/SidebarBlock/styles.scss b/hypha/static_src/src/app/src/components/SidebarBlock/styles.scss
index 04fcde87c..c4baa939f 100644
--- a/hypha/static_src/src/app/src/components/SidebarBlock/styles.scss
+++ b/hypha/static_src/src/app/src/components/SidebarBlock/styles.scss
@@ -1,3 +1,10 @@
.sidebar-block {
padding: 20px;
}
+
+.partition {
+ width: 100%;
+ height: 1px;
+ margin: 0px auto;
+ border-bottom: 1px solid #bfbdbd;
+}
diff --git a/hypha/static_src/src/app/src/components/SubmissionLink/styles.scss b/hypha/static_src/src/app/src/components/SubmissionLink/styles.scss
index 7fa5ae583..d32474b4e 100644
--- a/hypha/static_src/src/app/src/components/SubmissionLink/styles.scss
+++ b/hypha/static_src/src/app/src/components/SubmissionLink/styles.scss
@@ -1,5 +1,4 @@
.submission-link {
- border-top: 1px solid $color--light-mid-grey;
margin: 0 20px;
padding: 20px 0;
diff --git a/hypha/static_src/src/app/src/containers/ReviewInformation.js b/hypha/static_src/src/app/src/containers/ReviewInformation.js
index 69667053e..0ccd9e899 100644
--- a/hypha/static_src/src/app/src/containers/ReviewInformation.js
+++ b/hypha/static_src/src/app/src/containers/ReviewInformation.js
@@ -134,9 +134,7 @@ const ReviewInformation = ({ submission, submissionID, showReviewForm, toggleRev
{ partner.length === 0 && staff.length === 0 && nonStaff.length === 0 && <h5>No reviews available</h5>}
<ReviewBlock score={data.score} recommendation={data.recommendation.display}>
{ renderNormal(staff) }
- {staff.length !== 0 && partner.length !== 0 && <hr />}
{ renderNormal(partner) }
- {(partner.length !== 0 || staff.length !== 0) && nonStaff.length !== 0 && <hr />}
{ renderCollapsed(nonStaff) }
<div className="wrapper wrapper--sidebar-buttons">
diff --git a/hypha/static_src/src/app/src/containers/ScreeningStatus/index.js b/hypha/static_src/src/app/src/containers/ScreeningStatus/index.js
index 86da37631..7b4d4dda2 100644
--- a/hypha/static_src/src/app/src/containers/ScreeningStatus/index.js
+++ b/hypha/static_src/src/app/src/containers/ScreeningStatus/index.js
@@ -47,7 +47,7 @@ class ScreeningStatusContainer extends React.PureComponent {
selectVisibleOption } = this.props
return !screeningInfo.loading ? screeningStatuses && <SidebarBlock title="Screening Status" >
- <div className="screening-status-box" style={{ borderBottom: '1px solid #e8e8e8'}}>
+ <div className="screening-status-box" style={{ padding: '1rem'}}>
<div className="screening-default-options" >
<div
className={screeningInfo.selectedValues.length ||
@@ -59,7 +59,7 @@ class ScreeningStatusContainer extends React.PureComponent {
className = { screeningInfo.defaultSelectedValue.id == defaultOptions.yes.id ? "thumbs-up-color" : ""}
style={{ alignSelf: 'center'}}
>
- <path d="m1.75 23h2.5c.965 0 1.75-.785 1.75-1.75v-11.5c0-.965-.785-1.75-1.75-1.75h-2.5c-.965 0-1.75.785-1.75 1.75v11.5c0 .965.785 1.75 1.75 1.75z"></path><path d="m12.781.75c-1 0-1.5.5-1.5 3 0 2.376-2.301 4.288-3.781 5.273v12.388c1.601.741 4.806 1.839 9.781 1.839h1.6c1.95 0 3.61-1.4 3.94-3.32l1.12-6.5c.42-2.45-1.46-4.68-3.94-4.68h-4.72s.75-1.5.75-4c0-3-2.25-4-3.25-4z"></path>
+ <path d="m1.75 23h2.5c.965 0 1.75-.785 1.75-1.75v-11.5c0-.965-.785-1.75-1.75-1.75h-2.5c-.965 0-1.75.785-1.75 1.75v11.5c0 .965.785 1.75 1.75 1.75z"></path><path d="m12.781.75c-1 0-1.5.5-1.5 3 0 2.376-2.301 4.288-3.781 5.273v12.388c1.601.741 4.806 1.839 9.781 1.839h1.6c1.95 0 3.61-1.4 3.94-3.32l1.12-6.5c.42-2.45-1.46-4.68-3.94-4.68h-4.72s.75-1.5.75-4c0-3-2.25-4-3.25-4z"></path>
</SvgIcon>
<div>{defaultOptions.yes.title}</div>
</div>
--
GitLab