Merge branch 'master' into develop

golemfoundation · Mar 3, 2024 · 67977c5 · 67977c5
2 parents 663204d + 52b5e42
commit 67977c5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/client/src/components/Earn/EarnHistory/EarnHistory.module.scss b/client/src/components/Earn/EarnHistory/EarnHistory.module.scss
@@ -11,8 +11,12 @@
   }
 }
 
+.skeleton {
+  padding: 0 $historyHorizontalPadding;
+}
+
 .title {
-  padding: 0 1.6rem;
+  padding: 0 $historyHorizontalPadding;
 }
 
 .childrenWrapper {

diff --git a/client/src/components/Earn/EarnHistory/EarnHistory.tsx b/client/src/components/Earn/EarnHistory/EarnHistory.tsx
@@ -52,7 +52,9 @@ const EarnHistory: FC<EarnHistoryProps> = ({ className }) => {
       titleClassName={styles.title}
     >
       {showLoader ? (
-        <EarnHistorySkeleton />
+        <div className={styles.skeleton}>
+          <EarnHistorySkeleton />
+        </div>
       ) : (
         <InfiniteScroll
           hasMore={hasNextPage}

diff --git a/client/src/components/Earn/EarnHistory/EarnHistoryItem/EarnHistoryItem.module.scss b/client/src/components/Earn/EarnHistory/EarnHistoryItem/EarnHistoryItem.module.scss
@@ -6,7 +6,7 @@
 }
 
 .child {
-  padding: 1.3rem 1.6rem;
+  padding: 1.3rem $historyHorizontalPadding;
   border-radius: $border-radius-06;
 
   &:hover {
@@ -26,10 +26,9 @@
 }
 
 .separator {
-  $marginLeft: 1.6rem;
-  width: calc(100% - $marginLeft * 2);
+  width: calc(100% - $historyHorizontalPadding * 2);
   height: 0.1rem;
-  margin-left: $marginLeft;
+  margin-left: $historyHorizontalPadding;
   background: $color-octant-grey8;
 }
 

diff --git a/client/src/components/Earn/EarnHistory/EarnHistoryList/EarnHistoryList.module.scss b/client/src/components/Earn/EarnHistory/EarnHistoryList/EarnHistoryList.module.scss
@@ -1,5 +1,6 @@
 .emptyHistoryInfo {
   height: 7.2rem;
+  padding: 0 $historyHorizontalPadding;
   display: flex;
   align-items: center;
   color: $color-octant-grey5;

diff --git a/.../Metrics/MetricsEpoch/MetricsEpochGridTopProjects/MetricsEpochGridTopProjects.module.scss b/.../Metrics/MetricsEpoch/MetricsEpochGridTopProjects/MetricsEpochGridTopProjects.module.scss
@@ -10,20 +10,6 @@
   }
 }
 
-.numberOfAllocationsSuffix {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 2.4rem;
-  width: 3.2rem;
-  font-size: $font-size-10;
-  font-weight: $font-weight-bold;
-  color: $color-octant-dark;
-  border-radius: $border-radius-08;
-  background-color: $color-octant-grey3;
-  margin-left: auto;
-}
-
 .noAllocationsYet {
   height: 100%;
   width: 100%;

diff --git a/...mponents/Metrics/MetricsEpoch/MetricsEpochGridTopProjects/MetricsEpochGridTopProjects.tsx b/...mponents/Metrics/MetricsEpoch/MetricsEpochGridTopProjects/MetricsEpochGridTopProjects.tsx
@@ -49,7 +49,6 @@ const MetricsEpochGridTopProjects: FC<MetricsEpochGridTopProjectsProps> = ({
             />
           ),
           title: t('topProjectsByEthRaised', { numberOfProjects }),
-          titleSuffix: <div className={styles.numberOfAllocationsSuffix}>{projects.length}</div>,
         },
       ]}
       size="custom"

diff --git a/.../src/components/Metrics/MetricsGrid/MetricsGridTileValue/MetricsGridTileValue.module.scss b/.../src/components/Metrics/MetricsGrid/MetricsGridTileValue/MetricsGridTileValue.module.scss
@@ -41,6 +41,7 @@
     font-size: $font-size-24;
     font-weight: $font-weight-bold;
     color: $color-octant-dark;
+    text-align: left;
   }
 
   .subvalue {
@@ -49,7 +50,7 @@
     font-weight: $font-weight-bold;
     display: flex;
     align-items: center;
-    justify-content: center;
+    justify-content: flex-start;
     height: 1.6rem;
     line-height: 1.6rem;
     margin-top: 1.2rem;

diff --git a/client/src/styles/utils/_variables.scss b/client/src/styles/utils/_variables.scss
@@ -32,3 +32,4 @@ $progressStepperSlimStepPadding: 2.4rem;
 $modalVariantSmallPaddingMobile: 2.4rem;
 $modalVariantSmallPaddingDesktop: 5.6rem;
 $proposalItemPadding: 2.4rem;
+$historyHorizontalPadding: 1.6rem;
-Original file line number
+Diff line change
@@ Expand Up @@
                 />
               ),
               title: t('topProjectsByEthRaised', { numberOfProjects }),
-              titleSuffix: <div className={styles.numberOfAllocationsSuffix}>{projects.length}</div>,
             },
           ]}
           size="custom"
@@ Expand Down @@