Browse Source

Merge pull request #15019 from thingsboard/rc

Merge rc to master
pull/15033/head
Vladyslav Prykhodko 6 months ago
committed by GitHub
parent
commit
c3f22cd9db
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.scss
  2. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/image-cards-select.component.scss
  3. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.scss
  4. 2
      ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html
  5. 2
      ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.scss

2
ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.scss

@ -43,7 +43,7 @@
}
}
> .mat-expansion-panel-content {
.mat-expansion-panel-content {
> .mat-expansion-panel-body {
padding: 0;
}

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/image-cards-select.component.scss

@ -44,7 +44,7 @@
display: none;
}
}
> .mat-expansion-panel-content {
.mat-expansion-panel-content {
> .mat-expansion-panel-body {
padding: 0 16px 16px !important;
}

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.scss

@ -108,7 +108,7 @@
align-items: center;
}
> .mat-expansion-panel-content {
.mat-expansion-panel-content {
> .mat-expansion-panel-body {
padding: 0;
}

2
ui-ngx/src/app/modules/home/pages/admin/mail-server.component.html

@ -280,7 +280,7 @@
</mat-error>
</div>
<div class="flex flex-1 flex-col">
<div class="flex flex-1 flex-col gt-xs:w-0">
<mat-form-field class="mat-block flex-1">
<mat-label translate>admin.oauth2.redirect-uri-template</mat-label>
<input matInput formControlName="redirectUri" readonly>

2
ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.scss

@ -65,7 +65,7 @@
:host ::ng-deep {
.tb-form-panel .mat-expansion-panel.tb-settings {
& > .mat-expansion-panel-content > .mat-expansion-panel-body {
.mat-expansion-panel-content > .mat-expansion-panel-body {
gap: 0;
}
}

Loading…
Cancel
Save