Skip to content

Commit

Permalink
fix(core/content-header): adapt spacing (#1514)
Browse files Browse the repository at this point in the history
Co-authored-by: AndreasBerliner <[email protected]>
  • Loading branch information
matthiashader and AndreasBerliner authored Oct 16, 2024
1 parent 7fe0136 commit 60760bc
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .changeset/eighty-clocks-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/content-header): adapt spacing
10 changes: 7 additions & 3 deletions packages/core/src/components/content-header/content-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@
display: flex;
flex-direction: row;
align-items: flex-start;
padding: 0px;
padding: 0;

.titleGroup {
display: flex;
flex-direction: column;
flex: 1 1 0%;
flex: 1 1 0;

.secondary {
padding: 0.25rem 0;
}
}

.subtitle {
margin-top: 0.5rem;
margin-top: -0.125rem;
}

.backButton {
Expand Down
15 changes: 11 additions & 4 deletions packages/core/src/components/content-header/content-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,21 @@ export class ContentHeader {
) : null}

<div class="titleGroup">
<ix-typography format={this.variant === 'secondary' ? 'h4' : 'h3'}>
<ix-typography
format={this.variant === 'secondary' ? 'h4' : 'h3'}
class={this.variant === 'secondary' ? 'secondary' : ''}
>
{this.headerTitle}
</ix-typography>
{this.headerSubtitle !== undefined ? (
<ix-typography format={'h6'} color={'soft'} class="subtitle">
{!!this.headerSubtitle && (
<ix-typography
format={'h6'}
color={'soft'}
class={this.variant === 'secondary' ? 'subtitle' : ''}
>
{this.headerSubtitle}
</ix-typography>
) : null}
)}
</div>
<div class="buttons">
<slot />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 60760bc

Please sign in to comment.