chore(merge): merge with main

eclipse-tractusx · Mar 11, 2024 · b005ff8 · b005ff8
2 parents 1cf1290 + 2217436
commit b005ff8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Changelog
 
-## 2.1.38
+## 2.1.39
 
 - Fix warning about misspelled css property
 
+## 2.1.38
+
+- UI updates in stepper and dialog
+
 ## 2.1.37
 
 - Fix multiselect search and selected items display issues

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

diff --git a/src/components/basic/Dialog/DialogActions.tsx b/src/components/basic/Dialog/DialogActions.tsx
@@ -24,9 +24,8 @@ import MuiDialogActions, {
 } from '@mui/material/DialogActions'
 import { CONTENT_SPACING_RIGHT_LEFT } from './index'
 import './Dialog.scss'
-
 export interface DialogActionProps extends MuiDialogActionsProps {
-  helperText?: string
+  helperText?: string | JSX.Element
 }
 
 export const DialogActions = ({
@@ -42,10 +41,12 @@ export const DialogActions = ({
         padding: spacing(4, CONTENT_SPACING_RIGHT_LEFT),
         backgroundColor: 'background.background09',
       }}
+      className="actions-main"
     >
       {helperText && (
         <Box
           sx={{ paddingBottom: 4, typography: 'body3', textAlign: 'center' }}
+          className="helper-text"
         >
           {helperText}
         </Box>

diff --git a/src/components/basic/Dialog/DialogHeader.tsx b/src/components/basic/Dialog/DialogHeader.tsx
@@ -56,6 +56,7 @@ export const DialogHeader = ({
         padding: spacing(7, CONTENT_SPACING_RIGHT_LEFT),
         textAlign: 'center',
       }}
+      className="dialog-header-main"
     >
       {title && (
         <MuiDialogTitle

diff --git a/src/components/basic/Stepper/Stepper.scss b/src/components/basic/Stepper/Stepper.scss
@@ -24,7 +24,7 @@
         -webkit-flex: 1 0 0%;
         -ms-flex: 1 0 0%;
         flex: 1 0 0%;
-        width: 100%;
+        width: 160px;
         max-width: 100%;
 
         .stepHead {
@@ -38,7 +38,6 @@
             }
 
             .stepHeadline {
-                width: 95px;
                 margin: 0px auto 24px auto;
                 min-height: 56px;
             }

diff --git a/src/components/basic/Stepper/Stepper.stories.tsx b/src/components/basic/Stepper/Stepper.stories.tsx
@@ -42,7 +42,7 @@ const stepperElements = [
   },
   {
     step: 3,
-    headline: 'Technical Integration',
+    headline: 'Responsibilities & admin account',
   },
   {
     step: 4,