diff options
author | Ms Kimsible <1877318+kimsible@users.noreply.github.com> | 2021-09-08 10:12:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-08 10:12:38 +0200 |
commit | b16e0cf2484e482105f236f5f3155e467cf71a2f (patch) | |
tree | 54c775556f0245d3de24b5baef734cc9eb610866 | |
parent | fb72d2e1c24cd4660fd6611ef723c5827c47294c (diff) | |
download | PeerTube-b16e0cf2484e482105f236f5f3155e467cf71a2f.tar.gz PeerTube-b16e0cf2484e482105f236f5f3155e467cf71a2f.tar.zst PeerTube-b16e0cf2484e482105f236f5f3155e467cf71a2f.zip |
Fix broken delete buttons of admin federation lists (#4378)
* Add ellipsis on my-delete button of federation admin
* Add ellipsis on button label to define (max-)width on host component
Co-authored-by: Ms Kimsible <kimsible@users.noreply.github.com>
4 files changed, 16 insertions, 1 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.scss b/client/src/app/+admin/follows/followers-list/followers-list.component.scss index c29b20493..3a7bf2ef8 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.scss +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.scss | |||
@@ -21,3 +21,7 @@ a { | |||
21 | @include margin-right(10px); | 21 | @include margin-right(10px); |
22 | } | 22 | } |
23 | } | 23 | } |
24 | |||
25 | my-delete-button { | ||
26 | max-width: 130px; | ||
27 | } | ||
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html index 75b0efca8..c73469295 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.html +++ b/client/src/app/+admin/follows/following-list/following-list.component.html | |||
@@ -38,7 +38,7 @@ | |||
38 | <ng-template pTemplate="body" let-follow> | 38 | <ng-template pTemplate="body" let-follow> |
39 | <tr> | 39 | <tr> |
40 | <td class="action-cell"> | 40 | <td class="action-cell"> |
41 | <my-delete-button label="Unfollow" i18n-label (click)="removeFollowing(follow)"></my-delete-button> | 41 | <my-delete-button label (click)="removeFollowing(follow)"></my-delete-button> |
42 | </td> | 42 | </td> |
43 | <td> | 43 | <td> |
44 | <a [href]="follow.following.url" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> | 44 | <a [href]="follow.following.url" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> |
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.scss b/client/src/app/+admin/follows/following-list/following-list.component.scss index ef24b38cc..0de80e563 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.scss +++ b/client/src/app/+admin/follows/following-list/following-list.component.scss | |||
@@ -19,3 +19,7 @@ a { | |||
19 | .follow-button { | 19 | .follow-button { |
20 | @include create-button; | 20 | @include create-button; |
21 | } | 21 | } |
22 | |||
23 | my-delete-button { | ||
24 | max-width: 130px; | ||
25 | } | ||
diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss index e74ba0221..c782ac3ef 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.scss +++ b/client/src/app/shared/shared-main/buttons/button.component.scss | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | :host { | 14 | :host { |
15 | outline: none; | 15 | outline: none; |
16 | display: inline-block; | ||
16 | } | 17 | } |
17 | 18 | ||
18 | my-small-loader ::ng-deep .root { | 19 | my-small-loader ::ng-deep .root { |
@@ -31,6 +32,8 @@ span[class$=-button] { | |||
31 | .action-button { | 32 | .action-button { |
32 | @include peertube-button-link; | 33 | @include peertube-button-link; |
33 | @include button-with-icon(21px); | 34 | @include button-with-icon(21px); |
35 | |||
36 | width: 100%; // useful for ellipsis, allow to define a max-width on host component | ||
34 | } | 37 | } |
35 | 38 | ||
36 | .orange-button { | 39 | .orange-button { |
@@ -53,6 +56,10 @@ span[class$=-button] { | |||
53 | @include grey-button; | 56 | @include grey-button; |
54 | } | 57 | } |
55 | 58 | ||
59 | .button-label { | ||
60 | @include ellipsis; | ||
61 | } | ||
62 | |||
56 | // In a table, try to minimize the space taken by this button | 63 | // In a table, try to minimize the space taken by this button |
57 | @media screen and (max-width: 1400px) { | 64 | @media screen and (max-width: 1400px) { |
58 | :host-context(td) { | 65 | :host-context(td) { |