Skip to content
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

Jump to bottom

Fix accessibility action buttons and display on imports and followers #2986

Merged
merged 1 commit into from
Jul 20, 2020
Merged

Fix accessibility action buttons and display on imports and followers #2986

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
4 changes: 2 additions & 2 deletions client/src/app/+admin/follows/followers-list/followers-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

<td class="action-cell">
<ng-container *ngIf="follow.state === 'pending'">
<my-button i18n-label label="Accept" icon="tick" (click)="acceptFollower(follow)"></my-button>
<my-button i18n-label label="Refuse" icon="cross" (click)="rejectFollower(follow)"></my-button>
<my-button i18n-title title="Accept" icon="tick" (click)="acceptFollower(follow)"></my-button>
<my-button i18n-title title="Refuse" icon="cross" (click)="rejectFollower(follow)"></my-button>
</ng-container>

<my-delete-button *ngIf="follow.state === 'accepted'" (click)="deleteFollower(follow)"></my-delete-button>
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h1 class="sr-only" i18n>Imports</h1>
<td>{{ videoImport.createdAt | date: 'short' }}</td>

<td class="action-cell">
<my-edit-button *ngIf="isVideoImportSuccess(videoImport) && videoImport.video" [routerLink]="getEditVideoUrl(videoImport.video)"></my-edit-button>
<my-edit-button label=" " *ngIf="isVideoImportSuccess(videoImport) && videoImport.video" [routerLink]="getEditVideoUrl(videoImport.video)"></my-edit-button>
</td>
</tr>
</ng-template>
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/shared/shared-main/buttons/button.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<span class="action-button" [ngClass]="getClasses()" [title]="getTitle()">
<span class="action-button" [ngClass]="getClasses()" [title]="getTitle()" tabindex="0">
<my-global-icon *ngIf="!loading" [iconName]="icon"></my-global-icon>
<my-small-loader [loading]="loading"></my-small-loader>

Expand Down
2 changes: 1 addition & 1 deletion client/src/app/shared/shared-main/buttons/delete-button.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<span class="action-button action-button-delete grey-button" [title]="title" role="button">
<span class="action-button action-button-delete grey-button" [title]="title" role="button" tabindex="0">
<my-global-icon iconName="delete" aria-hidden="true"></my-global-icon>

<span class="button-label" *ngIf="label">{{ label }}</span>
Expand Down
20 changes: 1 addition & 19 deletions client/src/sass/primeng-custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,6 @@ p-table {
tr {
&:hover {
background-color: pvar(--submenuColor) !important;

.action-cell {
.dropdown-root,
my-edit-button,
my-delete-button,
my-button {
display: inline-block !important;
}
}
}

td {
Expand Down Expand Up @@ -164,18 +155,9 @@ p-table {
my-edit-button,
my-delete-button,
my-button {
display: none !important;
display: inline-block !important;
margin-left: 5px;

&.show {
display: inline-block !important;
}

// keep displaying on touchscreen
@media not all and (hover: hover) and (pointer: fine) {
display: inline-block !important;
}

:first-child {
margin-left: 0
}
Expand Down