aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/follows/following-list/following-list.component.html13
-rw-r--r--client/src/app/+admin/users/user-list/user-list.component.html11
-rw-r--r--client/src/app/shared/shared-moderation/moderation.scss1
-rw-r--r--client/src/app/shared/shared-moderation/server-blocklist.component.html11
-rw-r--r--client/src/sass/primeng-custom.scss8
5 files changed, 26 insertions, 18 deletions
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 ed3899e71..cf87ec05f 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
@@ -11,6 +11,13 @@
11> 11>
12 <ng-template pTemplate="caption"> 12 <ng-template pTemplate="caption">
13 <div class="caption"> 13 <div class="caption">
14 <div class="left-buttons">
15 <a class="follow-button" (click)="addDomainsToFollow()" (key.enter)="addDomainsToFollow()">
16 <my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
17 <ng-container i18n>Follow instances</ng-container>
18 </a>
19 </div>
20
14 <div class="ml-auto has-feedback has-clear"> 21 <div class="ml-auto has-feedback has-clear">
15 <input 22 <input
16 type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." 23 type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
@@ -19,10 +26,6 @@
19 <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a> 26 <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
20 <span class="sr-only" i18n>Clear filters</span> 27 <span class="sr-only" i18n>Clear filters</span>
21 </div> 28 </div>
22 <a class="ml-2 follow-button" (click)="addDomainsToFollow()" (key.enter)="addDomainsToFollow()">
23 <my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
24 <ng-container i18n>Follow domain</ng-container>
25 </a>
26 </div> 29 </div>
27 </ng-template> 30 </ng-template>
28 31
@@ -39,7 +42,7 @@
39 <ng-template pTemplate="body" let-follow> 42 <ng-template pTemplate="body" let-follow>
40 <tr> 43 <tr>
41 <td class="action-cell"> 44 <td class="action-cell">
42 <my-delete-button label (click)="removeFollowing(follow)"></my-delete-button> 45 <my-delete-button label="Unfollow" i18n-label (click)="removeFollowing(follow)"></my-delete-button>
43 </td> 46 </td>
44 <td> 47 <td>
45 <a [href]="'https://' + follow.following.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> 48 <a [href]="'https://' + follow.following.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer">
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index b02faef5d..4a09fb392 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -8,12 +8,17 @@
8> 8>
9 <ng-template pTemplate="caption"> 9 <ng-template pTemplate="caption">
10 <div class="caption"> 10 <div class="caption">
11 <div> 11 <div class="left-buttons">
12 <my-action-dropdown 12 <my-action-dropdown
13 *ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange" 13 *ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange"
14 [actions]="bulkUserActions" [entry]="selectedUsers" 14 [actions]="bulkUserActions" [entry]="selectedUsers"
15 > 15 >
16 </my-action-dropdown> 16 </my-action-dropdown>
17
18 <a *ngIf="!isInSelectionMode()" class="add-button" routerLink="/admin/users/create">
19 <my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
20 <ng-container i18n>Create user</ng-container>
21 </a>
17 </div> 22 </div>
18 23
19 <div class="ml-auto"> 24 <div class="ml-auto">
@@ -37,10 +42,6 @@
37 </div> 42 </div>
38 </div> 43 </div>
39 44
40 <a class="ml-2 add-button" routerLink="/admin/users/create">
41 <my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
42 <ng-container i18n>Create user</ng-container>
43 </a>
44 </div> 45 </div>
45 </ng-template> 46 </ng-template>
46 47
diff --git a/client/src/app/shared/shared-moderation/moderation.scss b/client/src/app/shared/shared-moderation/moderation.scss
index c57872bae..4a4e05535 100644
--- a/client/src/app/shared/shared-moderation/moderation.scss
+++ b/client/src/app/shared/shared-moderation/moderation.scss
@@ -105,7 +105,6 @@ my-action-dropdown.show {
105 background: transparent; 105 background: transparent;
106 display: inline-flex; 106 display: inline-flex;
107 justify-content: center; 107 justify-content: center;
108 align-items: center;
109 position: relative; 108 position: relative;
110 109
111 img { 110 img {
diff --git a/client/src/app/shared/shared-moderation/server-blocklist.component.html b/client/src/app/shared/shared-moderation/server-blocklist.component.html
index 225d49c1b..a6e974b36 100644
--- a/client/src/app/shared/shared-moderation/server-blocklist.component.html
+++ b/client/src/app/shared/shared-moderation/server-blocklist.component.html
@@ -11,6 +11,13 @@
11> 11>
12 <ng-template pTemplate="caption"> 12 <ng-template pTemplate="caption">
13 <div class="caption"> 13 <div class="caption">
14 <div class="left-buttons">
15 <a class="block-button" (click)="addServersToBlock()" (key.enter)="addServersToBlock()">
16 <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
17 <ng-container i18n>Mute domain</ng-container>
18 </a>
19 </div>
20
14 <div class="ml-auto has-feedback has-clear"> 21 <div class="ml-auto has-feedback has-clear">
15 <input 22 <input
16 type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." 23 type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
@@ -19,10 +26,6 @@
19 <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a> 26 <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
20 <span class="sr-only" i18n>Clear filters</span> 27 <span class="sr-only" i18n>Clear filters</span>
21 </div> 28 </div>
22 <a class="ml-2 block-button" (click)="addServersToBlock()" (key.enter)="addServersToBlock()">
23 <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
24 <ng-container i18n>Mute domain</ng-container>
25 </a>
26 </div> 29 </div>
27 </ng-template> 30 </ng-template>
28 31
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 0023b2d69..5e2bed896 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -503,6 +503,10 @@ p-table {
503 display: inline-flex; 503 display: inline-flex;
504 align-items: center; 504 align-items: center;
505 505
506 .left-buttons {
507 padding-left: 15px;
508 }
509
506 .input-group-text { 510 .input-group-text {
507 background-color: transparent; 511 background-color: transparent;
508 } 512 }
@@ -627,8 +631,6 @@ p-table {
627 631
628 .action-cell { 632 .action-cell {
629 width: 250px !important; 633 width: 250px !important;
630 padding: 0 !important;
631 text-align: center;
632 634
633 .dropdown-root, 635 .dropdown-root,
634 my-edit-button, 636 my-edit-button,
@@ -637,7 +639,7 @@ p-table {
637 display: inline-block !important; 639 display: inline-block !important;
638 margin-left: 5px; 640 margin-left: 5px;
639 641
640 :first-child { 642 &:first-child {
641 margin-left: 0 643 margin-left: 0
642 } 644 }
643 } 645 }