Skip to content

Commit

Permalink
Merge pull request #105 from catenax-ng/fix/sub-navigation-style
Browse files Browse the repository at this point in the history
fix(sub navigation): update header and button styles
  • Loading branch information
oyo authored Mar 4, 2024
2 parents 499e954 + 532e665 commit 1758fd1
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.1.35

- Update sub savigation header title and button styles

## 2.1.34

- Fix incomplete string escaping and encoding in DropPreview
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@catena-x/portal-shared-components",
"version": "2.1.34",
"version": "2.1.35",
"description": "Catena-X Portal Shared Components",
"author": "Catena-X Contributors",
"license": "Apache-2.0",
Expand Down
6 changes: 4 additions & 2 deletions src/components/basic/NewSubNavigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ export const NewSubNavigation = ({
marginLeft: '10px',
fontSize: '14px',
color: '#0f71cb',
textTransform: 'lowercase'
}}
>
{header}
</Typography>
{show && (
<Box className="navigationOverlay">
{navigationArray?.map((link: NavigationItem) => {
return (
Expand Down Expand Up @@ -115,6 +115,7 @@ export const NewSubNavigation = ({
? '#111111'
: '#888888',
fontSize: '14px',
textTransform: 'lowercase'
}}
>
{link.title}
Expand Down Expand Up @@ -145,14 +146,14 @@ export const NewSubNavigation = ({
size="small"
sx={{
marginTop: '10px',
textTransform: 'lowercase'
}}
>
{btn.buttonLabel}
</Button>
)
})}
</Box>
)}
</Box>
{buttonArray?.length === 1 && (
<Button
Expand All @@ -165,6 +166,7 @@ export const NewSubNavigation = ({
size="small"
sx={{
marginTop: '10px',
textTransform: 'lowercase'
}}
>
{buttonArray[0].buttonLabel}
Expand Down
1 change: 1 addition & 0 deletions src/components/basic/SubNavigation/ParentSubNavigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const ParentSubNavigation = ({
size="medium"
sx={{
fontSize: '16px',
textTransform: 'lowercase'
}}
>
<EastIcon sx={{ marginRight: '16px', fontSize: '15px' }} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/basic/SubNavigation/SubNavigationButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const SubNavigationButton = ({
color="secondary"
variant="outlined"
size="medium"
sx={{ float: 'right' }}
sx={{ float: 'right', textTransform: 'lowercase' }}
>
{buttonLabel}
</Button>
Expand Down
2 changes: 2 additions & 0 deletions src/components/basic/SubNavigation/SubNavigationLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const SubNavigationLink = ({
size="medium"
sx={{
fontSize: '16px',
textTransform: 'lowercase'
}}
>
<EastIcon sx={{ marginRight: '16px', fontSize: '15px' }} />
Expand All @@ -66,6 +67,7 @@ export const SubNavigationLink = ({
size="medium"
sx={{
fontSize: '16px',
textTransform: 'lowercase'
}}
>
<EastIcon sx={{ marginRight: '16px', fontSize: '15px' }} />
Expand Down

0 comments on commit 1758fd1

Please sign in to comment.