Skip to content

feat(element-theme): align ghost button naming convention #1882

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

Draft
ljanner wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(element-theme): align ghost button naming convention #1882

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
2 changes: 1 addition & 1 deletion docs/components/layout-navigation/modals.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ import { viewChild } from '@angular/core';
<h4 class="modal-title">Modal</h4>
<button
type="button"
class="btn btn-circle btn-ghost element-cancel"
class="btn btn-circle btn-tertiary-ghost element-cancel"
aria-label="Close modal"
(click)="modalRef.hide('cancel')"
></button>
Expand Down
2 changes: 1 addition & 1 deletion playwright/e2e/element-examples/si-tabs-legacy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test.describe('si-tabs', () => {
await si.visitExample(example);
await page.locator('si-tabset-legacy button').getByText('Reception').click();
await si.runVisualAndA11yTests();
await page.locator('si-tabset-legacy .btn-ghost.close').first().click();
await page.locator('si-tabset-legacy .btn-tertiary-ghost.close').first().click();
await expect(page.locator('#si-tabset button').getByText('Reception')).toHaveCount(0);
await si.runVisualAndA11yTests('delete');
});
Expand Down
2 changes: 1 addition & 1 deletion ...ts/dashboards-demo/src/app/components/widget-catalog/custom-widget-catalog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<span class="modal-title">Custom Catalog</span>
<button
type="button"
class="btn btn-circle btn-ghost element-cancel"
class="btn btn-circle btn-tertiary-ghost element-cancel"
aria-label="Close"
(click)="onCancel()"
>
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/action-modal/si-alert-dialog/si-alert-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="modal-title" [id]="titleId()">{{ heading() | translate: translationParams() }}</span>
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[attr.aria-label]="confirmBtnName() | translate"
[disabled]="!!loading"
(click)="modalRef.messageOrHide('confirm')"
Expand Down
2 changes: 1 addition & 1 deletion ...ects/element-ng/action-modal/si-confirmation-dialog/si-confirmation-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="modal-title" [id]="titleId()">{{ heading() | translate: translationParams() }}</span>
<button
type="button"
class="btn btn-circle btn-ghost element-cancel"
class="btn btn-circle btn-tertiary-ghost element-cancel"
[attr.aria-label]="declineBtnName() | translate"
[disabled]="!!loading"
(click)="modalRef.messageOrHide('decline')"
Expand Down
2 changes: 1 addition & 1 deletion ...g/action-modal/si-delete-confirmation-dialog/si-delete-confirmation-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="modal-title" [id]="titleId()">{{ heading() | translate: translationParams() }}</span>
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[attr.aria-label]="cancelBtnName() | translate"
[disabled]="!!loading"
(click)="modalRef.messageOrHide('cancel')"
Expand Down
2 changes: 1 addition & 1 deletion ...ects/element-ng/action-modal/si-edit-discard-dialog/si-edit-discard-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="modal-title" [id]="titleId()">{{ heading() | translate: translationParams() }}</span>
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[attr.aria-label]="cancelBtnName() | translate"
[disabled]="!!loading"
(click)="modalRef.messageOrHide('cancel')"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/application-header/launchpad/si-launchpad-factory.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</span>
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[attr.aria-label]="closeText() | translate"
(click)="closeLaunchpad()"
>
Expand Down
4 changes: 2 additions & 2 deletions projects/element-ng/chat-messages/si-ai-message.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@for (action of actions(); track $index) {
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[disabled]="action.disabled"
[attr.aria-label]="action.label | translate"
(click)="action.action(actionParam(), action)"
Expand All @@ -25,7 +25,7 @@
@if (secondaryActions().length > 0) {
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[cdkMenuTriggerFor]="secondaryActionsMenu"
[attr.aria-label]="secondaryActionsLabel() | translate"
[attr.title]="secondaryActionsLabel() | translate"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/chat-messages/si-attachment-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@if (removable()) {
<button
type="button"
class="btn btn-ghost btn-icon expand-button flex-shrink-0 ms-auto align-self-center focus-inside"
class="btn btn-tertiary-ghost btn-icon expand-button flex-shrink-0 ms-auto align-self-center focus-inside"
[attr.aria-label]="(removeLabel() | translate) + ' ' + attachment.name"
(click)="remove.emit(attachment); $event.stopPropagation()"
>
Expand Down
8 changes: 4 additions & 4 deletions projects/element-ng/chat-messages/si-chat-input.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[attr.aria-label]="attachFileLabel() | translate"
[disabled]="disabled()"
(click)="fileInput.click()"
Expand All @@ -64,7 +64,7 @@
@for (action of actions(); track $index) {
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[disabled]="action.disabled"
[attr.aria-label]="action.label | translate"
(click)="action.action(actionParam(), action)"
Expand All @@ -76,7 +76,7 @@
@if (secondaryActions().length > 0) {
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[cdkMenuTriggerFor]="secondaryActionsMenu"
[attr.aria-label]="secondaryActionsLabel() | translate"
[attr.title]="secondaryActionsLabel() | translate"
Expand All @@ -97,7 +97,7 @@

<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[disabled]="buttonDisabled()"
[attr.aria-label]="buttonLabel() | translate"
(click)="onButtonClick()"
Expand Down
4 changes: 2 additions & 2 deletions projects/element-ng/chat-messages/si-user-message.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@for (action of actions(); track $index) {
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[disabled]="action.disabled"
[attr.aria-label]="action.label | translate"
(click)="action.action(actionParam(), action)"
Expand All @@ -28,7 +28,7 @@
@if (secondaryActions().length > 0) {
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[cdkMenuTriggerFor]="secondaryActionsMenu"
[attr.aria-label]="secondaryActionsLabel() | translate"
[attr.title]="secondaryActionsLabel() | translate"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/column-selection-dialog/si-column-selection-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<span class="modal-title" [id]="titleId()">{{ heading() | translate: translationParams() }}</span>
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[attr.aria-label]="cancelBtnName() | translate"
(click)="cancelColumnSelection()"
>
Expand Down
4 changes: 2 additions & 2 deletions ...ts/element-ng/dashboard/widgets/si-timeline-widget/si-timeline-widget-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</button>
} @else if (action.type === 'router-link') {
<a
class="d-flex btn btn-ghost"
class="d-flex btn btn-tertiary-ghost"
[routerLink]="action.routerLink"
[queryParams]="action.extras?.queryParams"
[queryParamsHandling]="action.extras?.queryParamsHandling"
Expand All @@ -62,7 +62,7 @@
>
} @else if (action.type === 'link') {
<a
class="d-flex btn btn-ghost"
class="d-flex btn btn-tertiary-ghost"
[href]="action.href"
[target]="action.target"
[attr.aria-label]="action.label | translate"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/file-uploader/si-file-uploader.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
@if (file.status === 'added' || file.status === 'error' || file.status === 'invalid') {
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[title]="removeButtonText() | translate"
[attr.aria-label]="removeButtonText() | translate"
(click)="removeFile($index)"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/filter-bar/si-filter-pill.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ng-template #remove>
<button
type="button"
class="btn-remove btn btn-circle btn-ghost focus-inside ms-0 btn-sm"
class="btn-remove btn btn-circle btn-tertiary-ghost focus-inside ms-0 btn-sm"
role="button"
aria-label="Remove"
[disabled]="disabled()"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/filtered-search/si-filtered-search-value.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<div class="pill px-0 ms-n1">
<button
type="button"
class="btn btn-circle btn-sm btn-ghost focus-inside"
class="btn btn-circle btn-sm btn-tertiary-ghost focus-inside"
[attr.aria-label]="clearButtonLabel() | translate"
[disabled]="disabled()"
(click)="clear()"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/filtered-search/si-filtered-search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<div class="clear-button-container">
<button
type="button"
class="btn btn-icon btn-sm btn-ghost mx-2"
class="btn btn-icon btn-sm btn-tertiary-ghost mx-2"
[disabled]="disabled()"
[attr.aria-label]="clearButtonLabel() | translate"
(click)="deleteAllCriteria($event)"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/loading-spinner/si-loading-button.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ button.loading {
--loading-spinner-color: #{variables.$element-action-warning-text};
}

:is(.btn-ghost, .btn-primary-ghost, .btn-secondary-ghost, .btn-tertiary-ghost) + .spinner-wrapper {
:is(.btn-ghost, .btn-secondary-ghost, .btn-tertiary-ghost) + .spinner-wrapper {
--loading-spinner-color: #{variables.$element-text-primary};
}

Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/navbar-vertical-next/si-navbar-vertical-next.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="mobile-drawer focus-inside navbar-vertical-no-collapse">
<button
type="button"
class="btn btn-icon btn-ghost"
class="btn btn-icon btn-tertiary-ghost"
[attr.aria-label]="
(collapsed() ? navbarExpandButtonText() : navbarCollapseButtonText()) | translate
"
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/navbar-vertical/si-navbar-vertical.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="mobile-drawer focus-inside navbar-vertical-no-collapse">
<button
type="button"
class="btn btn-icon btn-ghost"
class="btn btn-icon btn-tertiary-ghost"
[attr.aria-label]="
(collapsed() ? navbarExpandButtonText() : navbarCollapseButtonText()) | translate
"
Expand Down
8 changes: 4 additions & 4 deletions projects/element-ng/notification-item/si-notification-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<ng-template #actionButton let-action>
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[attr.aria-label]="action.ariaLabel"
(click)="action.action(action)"
>
Expand All @@ -122,7 +122,7 @@

<ng-template #routerLink let-action>
<a
class="btn btn-ghost p-2 btn-icon"
class="btn btn-tertiary-ghost p-2 btn-icon"
[routerLink]="action.routerLink"
[queryParams]="action.extras?.queryParams"
[queryParamsHandling]="action.extras?.queryParamsHandling"
Expand All @@ -140,7 +140,7 @@

<ng-template #link let-action>
<a
class="btn btn-ghost p-2 btn-icon"
class="btn btn-tertiary-ghost p-2 btn-icon"
[href]="action.href"
[target]="action.target"
[attr.aria-label]="action.ariaLabel"
Expand All @@ -152,7 +152,7 @@
<ng-template #menu let-action>
<button
type="button"
class="btn btn-ghost btn-icon"
class="btn btn-tertiary-ghost btn-icon"
[attr.aria-label]="heading() + ' dropdown'"
[cdkMenuTriggerFor]="actionMenu"
>
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/photo-upload/si-photo-upload.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<h4 class="modal-title" [id]="titleId">{{ modalHeader() | translate }}</h4>
<button
type="button"
class="btn btn-circle btn-ghost"
class="btn btn-circle btn-tertiary-ghost"
[attr.aria-label]="cancelEditText() | translate"
(click)="imageCropperCanceled()"
>
Expand Down
6 changes: 5 additions & 1 deletion projects/element-ng/pills-input/si-input-pill.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<ng-content />
</div>
@if (!hideClose()) {
<span class="ms-2 btn btn-circle btn-sm btn-ghost" aria-hidden="true" (click)="deletePill.emit()">
<span
class="ms-2 btn btn-circle btn-sm btn-tertiary-ghost"
aria-hidden="true"
(click)="deletePill.emit()"
>
<si-icon [icon]="icons.elementCancel" />
</span>
}
4 changes: 2 additions & 2 deletions projects/element-ng/pills-input/si-pills-input.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ describe('SiPillsInputComponent', () => {
fixture.detectChanges();
await fixture.whenStable();
fixture.detectChanges();
componentElement.querySelectorAll<HTMLElement>('.btn-ghost')![1].click();
componentElement.querySelectorAll<HTMLElement>('.btn-tertiary-ghost')![1].click();
expect(component.value).toEqual(['item-1']);
fixture.detectChanges();
await fixture.whenStable();
componentElement.querySelector<HTMLElement>('.btn-ghost')!.click();
componentElement.querySelector<HTMLElement>('.btn-tertiary-ghost')!.click();
expect(component.value).toEqual([]);
});

Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/search-bar/si-search-bar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@if (searchValue()) {
<button
type="button"
class="btn btn-icon btn-sm btn-ghost cancel-button"
class="btn btn-icon btn-sm btn-tertiary-ghost cancel-button"
[attr.aria-label]="clearButtonAriaLabel() | translate"
[disabled]="disabled() || readonly()"
(click)="resetForm()"
Expand Down
10 changes: 5 additions & 5 deletions projects/element-ng/side-panel/si-side-panel-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@if (displayMode() === 'navigate' && navigateConfig) {
@if (navigateConfig.type === 'router-link') {
<a
class="btn btn-icon btn-ghost auto-hide"
class="btn btn-icon btn-tertiary-ghost auto-hide"
[class.ms-4]="collapsible()"
[class.mx-4]="!collapsible() || service.isTemporaryOpen()"
[routerLink]="navigateConfig.routerLink"
Expand All @@ -35,7 +35,7 @@
>
} @else if (navigateConfig.type === 'link') {
<a
class="btn btn-icon btn-ghost auto-hide"
class="btn btn-icon btn-tertiary-ghost auto-hide"
[class.ms-4]="collapsible()"
[class.mx-4]="!collapsible()"
[href]="navigateConfig.href"
Expand All @@ -53,7 +53,7 @@
@if (displayMode() === 'overlay') {
<button
type="button"
class="fullscreen-button btn btn-icon btn-ghost auto-hide"
class="fullscreen-button btn btn-icon btn-tertiary-ghost auto-hide"
[class.ms-4]="collapsible()"
[class.mx-4]="!collapsible() || service.isTemporaryOpen()"
[attr.aria-label]="
Expand All @@ -67,7 +67,7 @@
}
<button
type="button"
class="close-button btn btn-icon btn-ghost me-4"
class="close-button btn btn-icon btn-tertiary-ghost me-4"
[attr.aria-label]="closeButtonLabel() | translate"
[tabindex]="focusable() ? '0' : '-1'"
(click)="toggleSidePanel($event)"
Expand All @@ -77,7 +77,7 @@
<div class="collapse-toggle">
<button
type="button"
class="side-panel-collapse-toggle btn btn-icon btn-ghost mx-4"
class="side-panel-collapse-toggle btn btn-icon btn-tertiary-ghost mx-4"
[attr.aria-label]="toggleItemLabel() | translate"
(click)="toggleSidePanel($event)"
>
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/tabs-legacy/si-tabset/si-tabset-legacy.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
}
@if (tab.closable && !tab.disabled) {
<si-icon
class="ms-2 btn btn-circle btn-sm btn-ghost close"
class="ms-2 btn btn-circle btn-sm btn-tertiary-ghost close"
[icon]="icons.elementCancel"
(click)="closeTab($event, tab)"
/>
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/tabs/si-tab.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<si-tab-badge [badgeColor]="badgeColor()" [badgeContent]="badgeContent()" />
@if (closable() && !disabledTab()) {
<si-icon
class="ms-2 btn btn-circle btn-sm btn-ghost close"
class="ms-2 btn btn-circle btn-sm btn-tertiary-ghost close"
[icon]="icons.elementCancel"
(click)="closeTab($event)"
/>
Expand Down
2 changes: 1 addition & 1 deletion projects/element-ng/threshold/si-threshold.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@if (showAddRemoveButtons()) {
<button
type="button"
class="btn btn-circle btn-ghost m-4"
class="btn btn-circle btn-tertiary-ghost m-4"
[attr.aria-label]="deleteAriaLabel() | translate"
(click)="deleteStep($index)"
>
Expand Down
Loading
Loading