Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions packages/main/src/CardHeaderTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,37 +31,36 @@ export default function CardHeaderTemplate(this: CardHeader) {
}

<div class="ui5-card-header-text">
<div class="ui5-card-header-first-line">
{this.titleText &&
<div
id={`${this._id}-title`}
class="ui5-card-header-title"
part="title"
role="heading"
aria-level={3}
>{this.titleText}</div>
}

{this.additionalText &&
<div class="ui5-card-header-additionalText">
<span id={`${this._id}-additionalText`} part="additional-text" dir="auto">{this.additionalText}</span>
</div>
}
</div>
{this.titleText &&
<div
id={`${this._id}-title`}
class="ui5-card-header-title"
part="title"
role="heading"
aria-level={3}
>{this.titleText}</div>
}

{this.subtitleText &&
<div id={`${this._id}-subtitle`} class="ui5-card-header-subtitle" part="subtitle">{this.subtitleText}</div>
}
</div>
</div>

{this.hasAction &&
{(this.hasAction || this.additionalText) &&
<div
class="ui5-card-header-action"
class="ui5-card-header-action-and-additional-text"
onFocusIn={this._actionsFocusin}
onFocusOut={this._actionsFocusout}
>
<slot name="action"></slot>
{this.hasAction &&
<slot name="action"></slot>
}
Comment thread
s-todorova marked this conversation as resolved.
{this.additionalText &&
<div class="ui5-card-header-additionalText">
<span id={`${this._id}-additionalText`} part="additional-text" dir="auto">{this.additionalText}</span>
</div>
}
</div>
}
</div>
Expand Down
26 changes: 12 additions & 14 deletions packages/main/src/themes/CardHeader.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
position: relative;
display: flex;
align-items: center;
gap: 1rem;
padding: var(--_ui5_card_header_padding);
outline: none;
}
Expand Down Expand Up @@ -74,15 +75,6 @@
pointer-events: none;
}

.ui5-card-header-first-line {
display: flex;
flex-flow: row;
justify-content: space-between;
}

.ui5-card-header-additionalText {
flex: none;
}

.ui5-card-header .ui5-card-header-avatar {
height: 3rem;
Expand Down Expand Up @@ -112,13 +104,11 @@
font-family: var(--sapFontFamily);
font-size: var(--sapFontSmallSize);
color: var(--sapTile_TextColor);
text-align: left;
text-align: end;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
vertical-align: middle;
margin-inline-start: 1rem;
margin-block-start: 0.125rem;
}

.ui5-card-header .ui5-card-header-text .ui5-card-header-title {
Expand Down Expand Up @@ -155,8 +145,16 @@
-webkit-line-clamp: 3;
}

.ui5-card-header-action {
.ui5-card-header-action-and-additional-text {
display: flex;
padding-inline-start: 1rem;
flex-direction: column;
align-items: flex-end;
gap: 0.25rem;
align-self: flex-start;
}

.ui5-card-header-action-and-additional-text ::slotted([slot="action"]) {
position: relative;
top: -0.5rem;
inset-inline-end: -0.5rem;
}
Loading