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

Merge pull request #3806 from vvlladd28/bug/response/admin-setting/md

Browse Source 
UI: Fixed show OAuth2 settings in table screen
This commit is contained in:
Igor Kulikov 2020-12-04 09:19:52 +02:00 committed by GitHub
commit 87991deaf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
View File

@ -61,8 +61,8 @@
<div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px"> <div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px">
<div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px"> <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px">
<div fxLayout="column" fxFlex.sm="60" fxFlex.gt-sm="50"> <div fxLayout="column" fxFlex.sm="60" fxFlex.gt-sm="50">
<div fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px"> <div fxLayout="row" fxLayout.xs="column" fxLayout.md="column" fxLayoutGap="8px" fxLayoutGap.md="0px">
<mat-form-field fxFlex="30" fxFlex.xs class="mat-block"> <mat-form-field fxFlex="30" fxFlex.md fxFlex.xs class="mat-block">
<mat-label translate>admin.oauth2.protocol</mat-label> <mat-label translate>admin.oauth2.protocol</mat-label>
<mat-select formControlName="scheme"> <mat-select formControlName="scheme">
<mat-option *ngFor="let protocol of protocols" [value]="protocol"> <mat-option *ngFor="let protocol of protocols" [value]="protocol">

7
ui-ngx/src/app/modules/home/pages/admin/settings-card.scss
View File

@ -18,7 +18,12 @@
:host { :host {
mat-card.settings-card { mat-card.settings-card {
margin: 8px; margin: 8px;
@media #{$mat-gt-sm} {
@media #{$mat-md} {
width: 80%;
}
@media #{$mat-gt-md} {
width: 60%; width: 60%;
} }
} }