Merge branch 'master' into CORE-4993-sdg-tab

oacore · Dec 6, 2024 · 12029e9 · 12029e9
2 parents 3508b5a + 001f530
commit 12029e9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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-list .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-list .bar-menu-item:link,
+.bar-menu-list .bar-menu-item:visited {
+  text-decoration: none;
+}
 
-  &:hover,
-  &:focus {
-    color: inherit;
-    background: #0000000a;
-  }
+.bar-menu-list .bar-menu-item:hover,
+.bar-menu-list .bar-menu-item:focus {
+  color: inherit;
+  background: #0000000a;
+}
 
-  &:active,
-  &.active {
-    color: var(--white);
-    background: var(--primary);
-  }
+.bar-menu-list .bar-menu-item:active,
+.bar-menu-list .bar-menu-item.active {
+  color: var(--white);
+  background: var(--primary);
 }
diff --git 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
@@ -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