Merge pull request #1011 from culturecreates/develop

Develop
culturecreates · Feb 29, 2024 · 4fac2c7 · 4fac2c7
2 parents fc46fd5 + 07d993b
commit 4fac2c7
Show file tree

Hide file tree

Showing 24 changed files with 443 additions and 179 deletions.
diff --git a/src/components/Card/Common/Event.jsx b/src/components/Card/Common/Event.jsx
@@ -17,7 +17,7 @@ function Event(props) {
             ...(marginResponsive ? { margin: marginResponsive } : { margin: '0 16px' }),
           }}>
           <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }} className="events-content" justify="space-between">
-            <Col flex={'423px'}>
+            <Col flex={'488px'}>
               <div className="add-event-section-wrapper">
                 {title && (
                   <Row>

diff --git a/src/components/DraggableTree/DraggableTree.jsx b/src/components/DraggableTree/DraggableTree.jsx
@@ -338,7 +338,7 @@ const DraggableTree = ({
   return (
     <div className="draggable-tree">
       <LanguageFilter calendarContentLanguage={calendarContentLanguage}>
-        <Form.Item style={{ width: '50%' }} key={contentLanguage.ENGLISH}>
+        <Form.Item key={contentLanguage.ENGLISH}>
           <span className="tag-header" data-cy="span-taxonomy-concept-english-title">
             {t('dashboard.taxonomy.addNew.concepts.english')}
           </span>
@@ -407,6 +407,9 @@ const DraggableTree = ({
           data-cy="modal-taxonomy-concept"
           open={addNewPopup}
           destroyOnClose
+          afterClose={() => {
+            setForEditing(false);
+          }}
           centered
           title={
             <span className="quick-create-organization-modal-title" data-cy="span-taxonomy-concept-add-edit">

diff --git a/src/components/DraggableTree/draggableTree.css b/src/components/DraggableTree/draggableTree.css
@@ -77,6 +77,7 @@
 .draggable-tree .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected:hover,
 .draggable-tree .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected:hover .ant-tree-treenode {
   background-color: #eff2ff;
+  transition: 0.3s;
 }
 
 .draggable-tree .ant-tree .anticon {
@@ -94,15 +95,13 @@
 .draggable-tree .ant-tree.ant-tree-block-node .ant-tree-list-holder-inner .ant-tree-node-content-wrapper {
   flex: auto;
   color: var(--content-neutral-primary, #222732);
-  font-family: Roboto;
   font-size: 12px;
   font-style: normal;
   font-weight: 400;
   line-height: 16px;
 }
 
 .draggable-tree .tag-header {
-  font-family: Roboto;
   font-size: 12px;
   font-style: normal;
   font-weight: 400;
@@ -119,7 +118,6 @@
 
 .draggable-tree .ant-tree .ant-tree-node-content-wrapper:hover {
   background-color: #eff2ff;
-  transition: 0.3s;
 }
 
 .custom-common-modal-container-wrapper .add-new-concept-wrapper .ant-row {
@@ -133,3 +131,23 @@
 .custom-common-modal-container .add-new-concept-wrapper .ant-form-item-label > label::after {
   display: none;
 }
+
+@media screen and (max-width: 480px) {
+  .draggable-tree .ant-tree.ant-tree-block-node .ant-tree-list-holder-inner .ant-tree-node-content-wrapper {
+    font-size: 10px;
+  }
+
+  .draggable-tree .ant-tree .anticon {
+    font-size: 18px;
+  }
+}
+
+@media screen and (max-width: 575px) {
+  .draggable-tree {
+    flex-direction: column;
+  }
+
+  .draggable-tree .tree-item {
+    border-right: solid 4px #eff2ff;
+  }
+}
diff --git a/src/components/Dropdown/Calendar/Calendar.jsx b/src/components/Dropdown/Calendar/Calendar.jsx
@@ -37,6 +37,7 @@ function Calendar({ children, allCalendarsData, setPageNumber }) {
             width: '32px',
             height: '32px',
             borderRadius: '73px',
+            objectFit: 'contain',
           }}
           src={item?.image?.uri}
         />

diff --git a/src/components/List/ListItem.jsx/ListItem.jsx b/src/components/List/ListItem.jsx/ListItem.jsx
@@ -6,7 +6,6 @@ import { LinkOutlined } from '@ant-design/icons';
 import moment from 'moment-timezone';
 import i18n from 'i18next';
 import Username from '../../Username/Username';
-
 import ArtsDataLink from '../../Tags/ArtsDataLink/ArtsDataLink';
 
 function ListItem(props) {
@@ -45,7 +44,7 @@ function ListItem(props) {
               <img
                 src={logo}
                 className="event-list-image"
-                style={{ height: '40px', width: '40px' }}
+                style={{ height: '40px', width: '40px', objectFit: 'cover' }}
                 data-cy="image-entity-logo"
               />
             </div>

diff --git a/src/components/Sidebar/Main/Sidebar.jsx b/src/components/Sidebar/Main/Sidebar.jsx
@@ -64,6 +64,7 @@ function Sidebar(props) {
                 width: '32px',
                 height: '32px',
                 borderRadius: '73px',
+                objectFit: 'contain',
               }}
               src={uri}
             />