diff options
5 files changed, 6 insertions, 24 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index 48b5681f4..ce603459e 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html | |||
@@ -44,8 +44,8 @@ | |||
44 | 44 | ||
45 | <td class="action-cell"> | 45 | <td class="action-cell"> |
46 | <ng-container *ngIf="follow.state === 'pending'"> | 46 | <ng-container *ngIf="follow.state === 'pending'"> |
47 | <my-button i18n-label label="Accept" icon="tick" (click)="acceptFollower(follow)"></my-button> | 47 | <my-button i18n-title title="Accept" icon="tick" (click)="acceptFollower(follow)"></my-button> |
48 | <my-button i18n-label label="Refuse" icon="cross" (click)="rejectFollower(follow)"></my-button> | 48 | <my-button i18n-title title="Refuse" icon="cross" (click)="rejectFollower(follow)"></my-button> |
49 | </ng-container> | 49 | </ng-container> |
50 | 50 | ||
51 | <my-delete-button *ngIf="follow.state === 'accepted'" (click)="deleteFollower(follow)"></my-delete-button> | 51 | <my-delete-button *ngIf="follow.state === 'accepted'" (click)="deleteFollower(follow)"></my-delete-button> |
diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html index 3e07550c1..4caa076a3 100644 --- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html +++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html | |||
@@ -45,7 +45,7 @@ | |||
45 | <td>{{ videoImport.createdAt | date: 'short' }}</td> | 45 | <td>{{ videoImport.createdAt | date: 'short' }}</td> |
46 | 46 | ||
47 | <td class="action-cell"> | 47 | <td class="action-cell"> |
48 | <my-edit-button *ngIf="isVideoImportSuccess(videoImport) && videoImport.video" [routerLink]="getEditVideoUrl(videoImport.video)"></my-edit-button> | 48 | <my-edit-button label=" " *ngIf="isVideoImportSuccess(videoImport) && videoImport.video" [routerLink]="getEditVideoUrl(videoImport.video)"></my-edit-button> |
49 | </td> | 49 | </td> |
50 | </tr> | 50 | </tr> |
51 | </ng-template> | 51 | </ng-template> |
diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html index a7dd4bb10..8eccd5c3c 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.html +++ b/client/src/app/shared/shared-main/buttons/button.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <span class="action-button" [ngClass]="getClasses()" [title]="getTitle()"> | 1 | <span class="action-button" [ngClass]="getClasses()" [title]="getTitle()" tabindex="0"> |
2 | <my-global-icon *ngIf="!loading" [iconName]="icon"></my-global-icon> | 2 | <my-global-icon *ngIf="!loading" [iconName]="icon"></my-global-icon> |
3 | <my-small-loader [loading]="loading"></my-small-loader> | 3 | <my-small-loader [loading]="loading"></my-small-loader> |
4 | 4 | ||
diff --git a/client/src/app/shared/shared-main/buttons/delete-button.component.html b/client/src/app/shared/shared-main/buttons/delete-button.component.html index 398b6db1e..6643e6013 100644 --- a/client/src/app/shared/shared-main/buttons/delete-button.component.html +++ b/client/src/app/shared/shared-main/buttons/delete-button.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <span class="action-button action-button-delete grey-button" [title]="title" role="button"> | 1 | <span class="action-button action-button-delete grey-button" [title]="title" role="button" tabindex="0"> |
2 | <my-global-icon iconName="delete" aria-hidden="true"></my-global-icon> | 2 | <my-global-icon iconName="delete" aria-hidden="true"></my-global-icon> |
3 | 3 | ||
4 | <span class="button-label" *ngIf="label">{{ label }}</span> | 4 | <span class="button-label" *ngIf="label">{{ label }}</span> |
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index a9a950dc0..2388c0469 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss | |||
@@ -79,15 +79,6 @@ p-table { | |||
79 | tr { | 79 | tr { |
80 | &:hover { | 80 | &:hover { |
81 | background-color: pvar(--submenuColor) !important; | 81 | background-color: pvar(--submenuColor) !important; |
82 | |||
83 | .action-cell { | ||
84 | .dropdown-root, | ||
85 | my-edit-button, | ||
86 | my-delete-button, | ||
87 | my-button { | ||
88 | display: inline-block !important; | ||
89 | } | ||
90 | } | ||
91 | } | 82 | } |
92 | 83 | ||
93 | td { | 84 | td { |
@@ -164,18 +155,9 @@ p-table { | |||
164 | my-edit-button, | 155 | my-edit-button, |
165 | my-delete-button, | 156 | my-delete-button, |
166 | my-button { | 157 | my-button { |
167 | display: none !important; | 158 | display: inline-block !important; |
168 | margin-left: 5px; | 159 | margin-left: 5px; |
169 | 160 | ||
170 | &.show { | ||
171 | display: inline-block !important; | ||
172 | } | ||
173 | |||
174 | // keep displaying on touchscreen | ||
175 | @media not all and (hover: hover) and (pointer: fine) { | ||
176 | display: inline-block !important; | ||
177 | } | ||
178 | |||
179 | :first-child { | 161 | :first-child { |
180 | margin-left: 0 | 162 | margin-left: 0 |
181 | } | 163 | } |