From 000caaf782afc9d9ec3812369e55955b8003d803 Mon Sep 17 00:00:00 2001
From: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com>
Date: Wed, 6 Nov 2024 12:57:36 +0400
Subject: [PATCH 1/3] CORE: fix overview layout (#703)

---
 templates/overview/index.jsx   | 4 ++--
 texts/memership/membership.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/overview/index.jsx b/templates/overview/index.jsx
index 11714309..190098ba 100644
--- a/templates/overview/index.jsx
+++ b/templates/overview/index.jsx
@@ -108,7 +108,7 @@ const OverviewTemplate = observer(
       >
         {globalStore.dataProvider?.issues?.harvestingStatus
           ?.lastHarvestingDate !== null ? (
-          <div>
+          <>
             <DataStatisticsCard
               metadatadaHistory={metadatadaHistory}
               metadataCount={metadataCount}
@@ -154,7 +154,7 @@ const OverviewTemplate = observer(
                 dataProviderId={dataProviderId}
               />
             )}
-          </div>
+          </>
         ) : (
           <Card className={styles.placeholderCard}>
             <Card.Title tag="h2">General information</Card.Title>
diff --git a/texts/memership/membership.yml b/texts/memership/membership.yml
index 87113b70..b359d0b9 100644
--- a/texts/memership/membership.yml
+++ b/texts/memership/membership.yml
@@ -20,7 +20,7 @@ plans:
         caption: Register interest
         url: https://docs.google.com/forms/d/e/1FAIpQLSfFJmMIspYfOEM5aOKG4FTZoK4qeqozyds47O75Wm4dJ1ta2w/viewform
 box:
- text: Here you can find a comparison table with detailed information about each features. It can help you choose the most sutible membership plan for you.
+ text: Here you can find a comparison table with detailed information about each features. It can help you choose the most suitable membership plan for you.
  action:
   caption: Compare features
   url: https://core.ac.uk/membership#comparison-table

From 8a6074647ca5c3305122303b763e2d1a16785b1a Mon Sep 17 00:00:00 2001
From: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com>
Date: Wed, 6 Nov 2024 19:21:08 +0400
Subject: [PATCH 2/3] CORE-4970: sidebar bug (#704)

---
 design/drawer/item.jsx          |  2 +-
 design/drawer/list.jsx          |  5 +++-
 design/drawer/styles.module.css | 42 ++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/design/drawer/item.jsx b/design/drawer/item.jsx
index 5d2ba2e4..32ac13b3 100644
--- a/design/drawer/item.jsx
+++ b/design/drawer/item.jsx
@@ -12,7 +12,7 @@ const FlatItem = ({
 }) => (
   <Tag
     className={classNames
-      .use(styles.item, active && styles.active)
+      .use(styles.barMenuItem, active && styles.active)
       .join(className)}
     {...restProps}
   >
diff --git a/design/drawer/list.jsx b/design/drawer/list.jsx
index bc539043..8eca7169 100644
--- a/design/drawer/list.jsx
+++ b/design/drawer/list.jsx
@@ -4,7 +4,10 @@ import { classNames } from '@oacore/design/lib/utils'
 import styles from './styles.module.css'
 
 const List = ({ children, className, tag: Tag = 'ul', ...restProps }) => (
-  <Tag className={classNames.use(styles.list).join(className)} {...restProps}>
+  <Tag
+    className={classNames.use(styles.barMenuList).join(className)}
+    {...restProps}
+  >
     {children}
   </Tag>
 )
diff --git a/design/drawer/styles.module.css b/design/drawer/styles.module.css
index 4123825e..307b51d4 100644
--- a/design/drawer/styles.module.css
+++ b/design/drawer/styles.module.css
@@ -1,4 +1,4 @@
-.list {
+.bar-menu-list {
   --drawer-list-padding-y: calc(var(--component-padding-y, 1rem) / 2);
   --drawer-list-padding-x: calc(var(--component-padding-x, 1rem) / 2);
   --drawer-item-padding-y: calc(var(--component-padding-y, 1rem) / 2);
@@ -9,36 +9,36 @@
   margin: 0;
   line-height: 1;
   list-style: none;
+}
 
-  & > li {
-    display: block;
-    padding: 0;
-    margin: 0;
-  }
+.bar-menu-list > li {
+  display: block;
+  padding: 0;
+  margin: 0;
 }
 
-.item {
+.bar-menu-item {
   display: flex;
   align-items: center;
   padding: var(--drawer-item-padding-y) var(--drawer-item-padding-x);
   margin: var(--drawer-item-spacing) 0;
   color: var(--gray-800);
   border-radius: var(--component-corner-radius, 2px);
+}
 
-  &:link,
-  &:visited {
-    text-decoration: none;
-  }
+.bar-menu-item:link,
+.bar-menu-item:visited {
+  text-decoration: none;
+}
 
-  &:hover,
-  &:focus {
-    color: inherit;
-    background: #0000000a;
-  }
+.bar-menu-item:hover,
+.bar-menu-item:focus {
+  color: inherit;
+  background: #0000000a;
+}
 
-  &:active,
-  &.active {
-    color: var(--white);
-    background: var(--primary);
-  }
+.bar-menu-item:active,
+.bar-menu-item.active {
+  color: var(--white);
+  background: var(--primary);
 }

From 001f53053b7f5dad7834a3ce32d673dccf99a781 Mon Sep 17 00:00:00 2001
From: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:47:38 +0400
Subject: [PATCH 3/3] CORE-4970: do nesting for style overwrite (#705)

---
 design/drawer/styles.module.css | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/design/drawer/styles.module.css b/design/drawer/styles.module.css
index 307b51d4..e594260f 100644
--- a/design/drawer/styles.module.css
+++ b/design/drawer/styles.module.css
@@ -17,7 +17,7 @@
   margin: 0;
 }
 
-.bar-menu-item {
+.bar-menu-list .bar-menu-item {
   display: flex;
   align-items: center;
   padding: var(--drawer-item-padding-y) var(--drawer-item-padding-x);
@@ -26,19 +26,19 @@
   border-radius: var(--component-corner-radius, 2px);
 }
 
-.bar-menu-item:link,
-.bar-menu-item:visited {
+.bar-menu-list .bar-menu-item:link,
+.bar-menu-list .bar-menu-item:visited {
   text-decoration: none;
 }
 
-.bar-menu-item:hover,
-.bar-menu-item:focus {
+.bar-menu-list .bar-menu-item:hover,
+.bar-menu-list .bar-menu-item:focus {
   color: inherit;
   background: #0000000a;
 }
 
-.bar-menu-item:active,
-.bar-menu-item.active {
+.bar-menu-list .bar-menu-item:active,
+.bar-menu-list .bar-menu-item.active {
   color: var(--white);
   background: var(--primary);
 }