Merge pull request #453 from culturecreates/feature/issue-419

Feature/issue 419
culturecreates · Jul 25, 2023 · 9322765 · 9322765
2 parents c130faf + 8ac572a
commit 9322765
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 27 deletions.
diff --git a/src/components/ArtsDataInfo/ArtsDataInfo.jsx b/src/components/ArtsDataInfo/ArtsDataInfo.jsx
@@ -6,23 +6,25 @@ import { LinkOutlined } from '@ant-design/icons';
 function ArtsDataInfo(props) {
   const { artsDataLink, name, disambiguatingDescription } = props;
   return (
-    <Row className="arts-data-info" align={'middle'} justify={'space-between'} span={24}>
-      <Row gutter={[4, 0]}>
-        <Col
-          className="arts-data-title"
-          onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}>
-          <span style={{ textDecoration: 'underline' }}>Artsdata</span>
-        </Col>
-        <Col className="arts-data-name">
-          <span>{name}</span>
-        </Col>
-        <Col>
-          <span>
-            <Badge color="#1B3DE6" />
-          </span>
-        </Col>
-        <Col className="arts-data-description">{disambiguatingDescription}</Col>
-      </Row>
+    <Row className="arts-data-info" align={'middle'} justify={'space-between'}>
+      <Col span={20}>
+        <Row gutter={[8, 0]} align={'middle'}>
+          <Col
+            className="arts-data-title"
+            onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}>
+            <span style={{ textDecoration: 'underline' }}>Artsdata</span>
+          </Col>
+          <Col className="arts-data-name">
+            <span>{name}</span>
+          </Col>
+          <Col>
+            <span>
+              <Badge color="#1B3DE6" style={{ height: '2px', width: '2px' }} />
+            </span>
+          </Col>
+          <Col className="arts-data-description">{disambiguatingDescription}</Col>
+        </Row>
+      </Col>
       <Col onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}>
         <span>
           <LinkOutlined />

diff --git a/src/components/ArtsDataInfo/artsDataInfo.css b/src/components/ArtsDataInfo/artsDataInfo.css
@@ -1,7 +1,7 @@
 .arts-data-info {
   background-color: #e3e8ff;
   color: #0f0e98;
-  height: 32px;
+  min-height: 32px;
   font-size: 12px;
   font-family: Roboto;
   font-style: normal;
@@ -13,3 +13,8 @@
 .arts-data-info .arts-data-title {
   cursor: pointer;
 }
+
+.arts-data-info .ant-badge-status-dot {
+  height: 2px;
+  width: 2px;
+}
diff --git a/src/components/Card/Common/Event.jsx b/src/components/Card/Common/Event.jsx
@@ -1,12 +1,13 @@
 import React from 'react';
 import { Row, Col } from 'antd';
+import './event.css';
 
 function Event(props) {
   const { title, required, hidden } = props;
   return (
     <Col
-      flex={'780px'}
       className="add-event-section-col"
+      flex={'780px'}
       style={{ display: hidden && 'none', borderRadius: '4px', backgroundColor: '#ffffff' }}>
       <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }} className="events-content">
         <Col flex={'423px'}>

diff --git a/src/components/Card/Common/event.css b/src/components/Card/Common/event.css
@@ -0,0 +1,6 @@
+.add-event-section-col {
+  padding: 24px;
+  background-color: #ffffff;
+  padding-left: 24px;
+  padding-right: 24px;
+}
diff --git a/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx b/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx
@@ -147,7 +147,7 @@ function OrganizationsReadOnly() {
           {artsDataLinkChecker(organizationData?.sameAs) && (
             <Col span={24}>
               <Row>
-                <Col>
+                <Col span={16}>
                   <ArtsDataInfo
                     artsDataLink={artsDataLinkChecker(organizationData?.sameAs)}
                     name={contentLanguageBilingual({
@@ -170,7 +170,7 @@ function OrganizationsReadOnly() {
 
           <Card>
             <Col>
-              <Row gutter={[0, 24]}>
+              <Row>
                 <Col span={24}>
                   <p className="read-only-event-content" style={{ fontSize: '24px' }}>
                     {t('dashboard.organization.readOnly.details')}

diff --git a/src/pages/Dashboard/PersonReadOnly/PersonReadOnly.jsx b/src/pages/Dashboard/PersonReadOnly/PersonReadOnly.jsx
@@ -94,7 +94,7 @@ function PersonReadOnly() {
           {artsDataLinkChecker(personData?.sameAs) && (
             <Col span={24}>
               <Row>
-                <Col>
+                <Col span={16}>
                   <ArtsDataInfo
                     artsDataLink={artsDataLinkChecker(personData?.sameAs)}
                     name={contentLanguageBilingual({
@@ -117,7 +117,7 @@ function PersonReadOnly() {
 
           <Card>
             <Col>
-              <Row gutter={[0, 24]}>
+              <Row>
                 <Col span={24}>
                   <p className="read-only-event-content" style={{ fontSize: '24px' }}>
                     {t('dashboard.people.readOnly.details')}

diff --git a/src/pages/Dashboard/PlaceReadOnly/PlaceReadOnly.jsx b/src/pages/Dashboard/PlaceReadOnly/PlaceReadOnly.jsx
@@ -148,7 +148,7 @@ function PlaceReadOnly() {
           {artsDataLinkChecker(placeData?.sameAs) && (
             <Col span={24}>
               <Row>
-                <Col flex={'780px'}>
+                <Col span={16}>
                   <ArtsDataInfo
                     artsDataLink={artsDataLinkChecker(placeData?.sameAs)}
                     name={contentLanguageBilingual({
@@ -170,7 +170,7 @@ function PlaceReadOnly() {
           )}
           <Card>
             <Col>
-              <Row gutter={[0, 24]}>
+              <Row>
                 {(placeData?.name?.fr || placeData?.name?.en) && (
                   <Col span={24}>
                     <p className="read-only-event-content-sub-title-primary">
@@ -316,9 +316,9 @@ function PlaceReadOnly() {
             <Col>
               <Row gutter={[0, 24]}>
                 <Col span={24}>
-                  <p className="read-only-event-content" style={{ fontSize: '24px' }}>
+                  <span className="read-only-event-content" style={{ fontSize: '24px' }}>
                     {t('dashboard.places.readOnly.address.address')}
-                  </p>
+                  </span>
                 </Col>
                 {(placeData?.address?.streetAddress?.en || placeData?.address?.streetAddress?.fr) && (
                   <Col span={24}>