Browse Source

UI: Fixed required mark for panel title

pull/14651/head
ArtemDzhereleiko 9 months ago
parent
commit
de2ba592c4
  1. 4
      ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html
  2. 4
      ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
  3. 4
      ui-ngx/src/app/modules/home/components/calculated-fields/components/simple-configuration/simple-configuration.component.html
  4. 1
      ui-ngx/src/app/shared/components/hint-tooltip-icon.component.scss
  5. 14
      ui-ngx/src/form.scss

4
ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html

@ -55,9 +55,7 @@
</div> </div>
} @else { } @else {
<div class="tb-form-panel no-gap stroked"> <div class="tb-form-panel no-gap stroked">
<div class="tb-form-panel-title tb-required"> <div class="tb-form-panel-title tb-required">{{ 'alarm-rule.script' | translate }}</div>
{{ 'alarm-rule.script' | translate }}
</div>
<tb-js-func formControlName="expression" <tb-js-func formControlName="expression"
functionName="expression" functionName="expression"
class="tb-alarm-rule-script" class="tb-alarm-rule-script"

4
ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html

@ -59,9 +59,7 @@
[isScript]="this.propagateConfiguration.get('applyExpressionToResolvedArguments').value"/> [isScript]="this.propagateConfiguration.get('applyExpressionToResolvedArguments').value"/>
</div> </div>
<div class="tb-form-panel no-gap" [class.!hidden]="!this.propagateConfiguration.get('applyExpressionToResolvedArguments').value"> <div class="tb-form-panel no-gap" [class.!hidden]="!this.propagateConfiguration.get('applyExpressionToResolvedArguments').value">
<div class="tb-form-panel-title tb-required"> <div class="tb-form-panel-title tb-required">{{ 'calculated-fields.script' | translate }}</div>
{{ 'calculated-fields.script' | translate }}
</div>
<div> <div>
<tb-js-func required <tb-js-func required
formControlName="expression" formControlName="expression"

4
ui-ngx/src/app/modules/home/components/calculated-fields/components/simple-configuration/simple-configuration.component.html

@ -27,9 +27,7 @@
[isScript]="isScript" /> [isScript]="isScript" />
</div> </div>
<div class="tb-form-panel no-gap"> <div class="tb-form-panel no-gap">
<div class="tb-form-panel-title tb-required"> <div class="tb-form-panel-title tb-required">{{ (isScript ? 'calculated-fields.type.script' : 'calculated-fields.expression') | translate }}</div>
{{ (isScript ? 'calculated-fields.type.script' : 'calculated-fields.expression') | translate }}
</div>
<mat-form-field class="mt-3" appearance="outline" subscriptSizing="dynamic" [class.hidden]="isScript"> <mat-form-field class="mt-3" appearance="outline" subscriptSizing="dynamic" [class.hidden]="isScript">
<input matInput formControlName="expressionSIMPLE" maxlength="255" [placeholder]="'(temperature - 32) / 1.8'" <input matInput formControlName="expressionSIMPLE" maxlength="255" [placeholder]="'(temperature - 32) / 1.8'"
required> required>

1
ui-ngx/src/app/shared/components/hint-tooltip-icon.component.scss

@ -17,7 +17,6 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: 4px;
} }
:host { :host {

14
ui-ngx/src/form.scss

@ -178,10 +178,11 @@
} }
&.tb-required::after { &.tb-required::after {
font-size: 13px; font-size: inherit;
color: rgba(0, 0, 0, .54); color: inherit;
vertical-align: top; vertical-align: top;
content: " *"; content: "*";
margin-left: 1px;
} }
} }
.tb-form-panel-hint { .tb-form-panel-hint {
@ -298,10 +299,11 @@
margin: 8px 0; margin: 8px 0;
} }
.tb-required::after { .tb-required::after {
font-size: 13px; font-size: inherit;
color: rgba(0, 0, 0, .54); color: inherit;
vertical-align: top; vertical-align: top;
content: " *"; content: "*";
margin-left: 1px;
} }
} }

Loading…
Cancel
Save