Merge pull request #90 from catenax-ng/updates/CPLP-3487/AppMarketpla…

…ceUIChanges
eclipse-tractusx · Feb 8, 2024 · b01b34d · b01b34d
2 parents 4f8c3d6 + 5af2234
commit b01b34d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.25
+
+- Orderstatus button ui changes
+
 ## 2.1.24
 
 - Fix image rerender bug

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-shared-components",
-  "version": "2.1.24",
+  "version": "2.1.25",
   "description": "Catena-X Portal Shared Components",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

diff --git a/src/components/basic/OrderStatusButton/index.tsx b/src/components/basic/OrderStatusButton/index.tsx
@@ -63,11 +63,11 @@ export const OrderStatusButton = ({
       <Button
         key={numberLabel}
         sx={{
-          width: '80%',
+          width: '28%',
           position: 'relative',
           zIndex,
-          paddingLeft: '74px',
-          marginLeft: '-50px',
+          paddingLeft: '50px',
+          marginLeft: '-40px',
           color: '#2a2a2a',
           background,
           height: '55px',
@@ -106,15 +106,19 @@ export const OrderStatusButton = ({
             {numberLabel}
           </Typography>
         )}
-        <Typography variant="label5">{buttonLabel}</Typography>
+        <Typography
+          variant="body2"
+          sx={{
+            fontSize: '11px'
+          }}
+        >{buttonLabel}</Typography>
       </Button>
     )
   }
 
   return (
     <Box
       sx={{
-        display: 'flex',
         alignItems: 'center',
         justifyContent: 'center',
         width: '100%',
@@ -127,7 +131,6 @@ export const OrderStatusButton = ({
         onClick={handleClick}
         sx={{
           fontSize: '16px',
-          width: '100%',
           position: 'relative',
           zIndex: '5',
           cursor: selectable ? 'pointer' : 'default',