1
0
Fork 0

Move orange admin buttons on the left side

This commit is contained in:
Chocobozzz 2021-01-13 10:39:26 +01:00
parent c9c43612d5
commit 9c1a88e3a1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 26 additions and 18 deletions

View File

@ -11,6 +11,13 @@
> >
<ng-template pTemplate="caption"> <ng-template pTemplate="caption">
<div class="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"> <div class="ml-auto has-feedback has-clear">
<input <input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." 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> <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
<span class="sr-only" i18n>Clear filters</span> <span class="sr-only" i18n>Clear filters</span>
</div> </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> </div>
</ng-template> </ng-template>
@ -39,7 +42,7 @@
<ng-template pTemplate="body" let-follow> <ng-template pTemplate="body" let-follow>
<tr> <tr>
<td class="action-cell"> <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>
<td> <td>
<a [href]="'https://' + follow.following.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer"> <a [href]="'https://' + follow.following.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer">

View File

@ -8,12 +8,17 @@
> >
<ng-template pTemplate="caption"> <ng-template pTemplate="caption">
<div class="caption"> <div class="caption">
<div> <div class="left-buttons">
<my-action-dropdown <my-action-dropdown
*ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange" *ngIf="isInSelectionMode()" i18n-label label="Batch actions" theme="orange"
[actions]="bulkUserActions" [entry]="selectedUsers" [actions]="bulkUserActions" [entry]="selectedUsers"
> >
</my-action-dropdown> </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>
<div class="ml-auto"> <div class="ml-auto">
@ -37,10 +42,6 @@
</div> </div>
</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> </div>
</ng-template> </ng-template>

View File

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

View File

@ -11,6 +11,13 @@
> >
<ng-template pTemplate="caption"> <ng-template pTemplate="caption">
<div class="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"> <div class="ml-auto has-feedback has-clear">
<input <input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." 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> <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
<span class="sr-only" i18n>Clear filters</span> <span class="sr-only" i18n>Clear filters</span>
</div> </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> </div>
</ng-template> </ng-template>

View File

@ -503,6 +503,10 @@ p-table {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
.left-buttons {
padding-left: 15px;
}
.input-group-text { .input-group-text {
background-color: transparent; background-color: transparent;
} }
@ -627,8 +631,6 @@ p-table {
.action-cell { .action-cell {
width: 250px !important; width: 250px !important;
padding: 0 !important;
text-align: center;
.dropdown-root, .dropdown-root,
my-edit-button, my-edit-button,
@ -637,7 +639,7 @@ p-table {
display: inline-block !important; display: inline-block !important;
margin-left: 5px; margin-left: 5px;
:first-child { &:first-child {
margin-left: 0 margin-left: 0
} }
} }