dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12048 from maxunbearable/fix/4948-assignee-select-icons

Browse Source 
Fixed icons view in assignee select
This commit is contained in:
Andrew Shvayka 2024-11-18 13:49:49 +01:00 committed by GitHub
commit 484ce0857f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/components/alarm/alarm-assignee-select.component.html
View File

@ -21,11 +21,11 @@
subscriptSizing="dynamic" [appearance]="inline ? 'outline' : 'fill'"> subscriptSizing="dynamic" [appearance]="inline ? 'outline' : 'fill'">
<mat-label *ngIf="!inline" translate>alarm.assignee</mat-label> <mat-label *ngIf="!inline" translate>alarm.assignee</mat-label>
<input matInput readonly formControlName="assignee"> <input matInput readonly formControlName="assignee">
<span *ngIf="assignee" matPrefix class="user-avatar" [class.inline]="inline" <span *ngIf="assignee" matPrefix class="user-avatar" [class.inline-icon]="inline"
[style.background-color]="getAvatarBgColor()"> [style.background-color]="getAvatarBgColor()">
{{ getUserInitials() }} {{ getUserInitials() }}
</span> </span>
<mat-icon *ngIf="!assignee" matPrefix class="unassigned-icon" [class.inline]="inline">account_circle</mat-icon> <mat-icon *ngIf="!assignee" matPrefix class="unassigned-icon" [class.inline-icon]="inline">account_circle</mat-icon>
<mat-icon *ngIf="!disabled" matSuffix class="drop-down-icon" [class.inline]="inline">arrow_drop_down</mat-icon> <mat-icon *ngIf="!disabled" matSuffix>arrow_drop_down</mat-icon>
</mat-form-field> </mat-form-field>
</ng-container> </ng-container>

2
ui-ngx/src/app/modules/home/components/alarm/alarm-assignee.component.scss
View File

@ -39,7 +39,7 @@
height: 28px; height: 28px;
margin-left: 12px; margin-left: 12px;
margin-right: 20px; margin-right: 20px;
&.inline { &.inline-icon {
margin-left: 0; margin-left: 0;
margin-right: 8px; margin-right: 8px;
} }