Browse Source

Move orange admin buttons on the left side

pull/3592/head
Chocobozzz 1 week ago
parent
commit
9c1a88e3a1
No known key found for this signature in database GPG Key ID: 583A612D890159BE
5 changed files with 26 additions and 18 deletions
  1. +8
    -5
      client/src/app/+admin/follows/following-list/following-list.component.html
  2. +6
    -5
      client/src/app/+admin/users/user-list/user-list.component.html
  3. +0
    -1
      client/src/app/shared/shared-moderation/moderation.scss
  4. +7
    -4
      client/src/app/shared/shared-moderation/server-blocklist.component.html
  5. +5
    -3
      client/src/sass/primeng-custom.scss

+ 8
- 5
client/src/app/+admin/follows/following-list/following-list.component.html View File

@@ -11,6 +11,13 @@
>
<ng-template pTemplate="caption">
<div class="caption">
<div class="left-buttons">
<a class="follow-button" (click)="addDomainsToFollow()" (key.enter)="addDomainsToFollow()">
<my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
<ng-container i18n>Follow instances</ng-container>
</a>
</div>

<div class="ml-auto has-feedback has-clear">
<input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
@@ -19,10 +26,6 @@
<a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
<span class="sr-only" i18n>Clear filters</span>
</div>
<a class="ml-2 follow-button" (click)="addDomainsToFollow()" (key.enter)="addDomainsToFollow()">
<my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
<ng-container i18n>Follow domain</ng-container>
</a>
</div>
</ng-template>

@@ -39,7 +42,7 @@
<ng-template pTemplate="body" let-follow>
<tr>
<td class="action-cell">
<my-delete-button label (click)="removeFollowing(follow)"></my-delete-button>
<my-delete-button label="Unfollow" i18n-label (click)="removeFollowing(follow)"></my-delete-button>
</td>
<td>
<a [href]="'https://' + follow.following.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer">


+ 6
- 5
client/src/app/+admin/users/user-list/user-list.component.html View File

@@ -8,12 +8,17 @@
>
<ng-template pTemplate="caption">
<div class="caption">
<div>
<div class="left-buttons">
<my-action-dropdown
*ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange"
[actions]="bulkUserActions" [entry]="selectedUsers"
>
</my-action-dropdown>

<a *ngIf="!isInSelectionMode()" class="add-button" routerLink="/admin/users/create">
<my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Create user</ng-container>
</a>
</div>

<div class="ml-auto">
@@ -37,10 +42,6 @@
</div>
</div>

<a class="ml-2 add-button" routerLink="/admin/users/create">
<my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Create user</ng-container>
</a>
</div>
</ng-template>



+ 0
- 1
client/src/app/shared/shared-moderation/moderation.scss View File

@@ -105,7 +105,6 @@ my-action-dropdown.show {
background: transparent;
display: inline-flex;
justify-content: center;
align-items: center;
position: relative;

img {


+ 7
- 4
client/src/app/shared/shared-moderation/server-blocklist.component.html View File

@@ -11,6 +11,13 @@
>
<ng-template pTemplate="caption">
<div class="caption">
<div class="left-buttons">
<a class="block-button" (click)="addServersToBlock()" (key.enter)="addServersToBlock()">
<my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Mute domain</ng-container>
</a>
</div>

<div class="ml-auto has-feedback has-clear">
<input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
@@ -19,10 +26,6 @@
<a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
<span class="sr-only" i18n>Clear filters</span>
</div>
<a class="ml-2 block-button" (click)="addServersToBlock()" (key.enter)="addServersToBlock()">
<my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
<ng-container i18n>Mute domain</ng-container>
</a>
</div>
</ng-template>



+ 5
- 3
client/src/sass/primeng-custom.scss View File

@@ -503,6 +503,10 @@ p-table {
display: inline-flex;
align-items: center;

.left-buttons {
padding-left: 15px;
}

.input-group-text {
background-color: transparent;
}
@@ -627,8 +631,6 @@ p-table {

.action-cell {
width: 250px !important;
padding: 0 !important;
text-align: center;

.dropdown-root,
my-edit-button,
@@ -637,7 +639,7 @@ p-table {
display: inline-block !important;
margin-left: 5px;

:first-child {
&:first-child {
margin-left: 0
}
}


Loading…
Cancel
Save