Skip to content

fux(ui5-card): Header counter is properly aligned #13947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s-todorova wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −31
Open

fux(ui5-card): Header counter is properly aligned #13947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 18 additions & 19 deletions packages/main/src/CardHeaderTemplate.tsx
View file
Open in desktop
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"
onFocusIn={this._actionsFocusin}
onFocusOut={this._actionsFocusout}
>
<slot name="action"></slot>
{this.hasAction &&
<slot name="action"></slot>
}
{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
16 changes: 4 additions & 12 deletions packages/main/src/themes/CardHeader.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,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 +103,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 @@ -157,6 +146,9 @@

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