EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2085 from crazyserver/MOBILE-3068 

MOBILE-3068 feedback: Fix range error format
main
Dani Palou 2019-08-29 11:34:34 +02:00 committed by GitHub
parent f4eee3c0e0 26dd20afff
commit 96abe1cf43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/mod/feedback/pages/form/form.html
View File

@ -30,7 +30,7 @@
</ng-container> </ng-container>
<ng-container *ngSwitchCase="'numeric'"> <ng-container *ngSwitchCase="'numeric'">
<ion-input [required]="item.required" name="{{item.typ}}_{{item.id}}" type="number" [(ngModel)]="item.value"></ion-input> <ion-input [required]="item.required" name="{{item.typ}}_{{item.id}}" type="number" [(ngModel)]="item.value"></ion-input>
<p *ngIf="item.hasError" color="error">{{ 'addon.mod_feedback.numberoutofrange' | translate }} [{{item.rangefrom}}<span *ngIf="item.rangefrom && item.rangeto">, </span>{{item.rangeto}}]</p> <p *ngIf="item.hasError" ion-text color="danger">{{ 'addon.mod_feedback.numberoutofrange' | translate }} [{{item.rangefrom}}<span *ngIf="item.rangefrom && item.rangeto">, </span>{{item.rangeto}}]</p>
</ng-container> </ng-container>
<ng-container *ngSwitchCase="'textarea'"> <ng-container *ngSwitchCase="'textarea'">
<ion-textarea [required]="item.required" name="{{item.typ}}_{{item.id}}" [attr.aria-multiline]="true" [(ngModel)]="item.value"></ion-textarea> <ion-textarea [required]="item.required" name="{{item.typ}}_{{item.id}}" [attr.aria-multiline]="true" [(ngModel)]="item.value"></ion-textarea>

12
src/app/app.scss
View File

@ -718,15 +718,21 @@ ion-app.app-root {
.core-#{$color-name}-item.item-input { .core-#{$color-name}-item.item-input {
border-bottom: 0 !important; border-bottom: 0 !important;
&.item-md .item-inner { &.item-md .item-inner,
&.item-md.item-input.ng-valid.item-input-has-value:not(.input-has-focus):not(.item-input-has-focus) .item-inner,
&.item-md.item-input.ng-valid.input-has-value:not(.input-has-focus):not(.item-input-has-focus) .item-inner {
@include md-input-highlight($color-base); @include md-input-highlight($color-base);
} }
&.item-ios .item-inner { &.item-ios .item-inner,
&.item-ios.item-input.ng-valid.item-input-has-value:not(.input-has-focus):not(.item-input-has-focus) .item-inner,
&.item-ios.item-input.ng-valid.input-has-value:not(.input-has-focus):not(.item-input-has-focus) .item-inner {
@include ios-input-highlight($color-base); @include ios-input-highlight($color-base);
} }
&.item-wp .item-inner { &.item-wp .text-input,
&.item-wp.item-input.ng-valid.item-input-has-value:not(.input-has-focus):not(.item-input-has-focus) .text-input,
&.item-wp.item-input.ng-valid.input-has-value:not(.input-has-focus):not(.item-input-has-focus) .text-input {
border-color: $color-base; border-color: $color-base;
} }
} }