Merge branch 'feature/v4' into feature/v4-CI-improvements

This commit is contained in:
Jamie 2020-01-06 20:29:10 +00:00 committed by GitHub
commit a14b463b44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -10,7 +10,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Application URL" [(ngModel)]="settings.applicationurl"> <input matInput placeholder="Application URL" [(ngModel)]="settings.applicationUrl">
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
@ -30,12 +30,10 @@
<mat-form-field *ngIf="settings.enableCustomDonations"> <mat-form-field *ngIf="settings.enableCustomDonations">
<input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.customDonationUrl" <input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.customDonationUrl" matTooltip="A link to a Paypal address, or your custom donation url.">
matTooltip="A link to a Paypal address, or your custom donation url.">
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="settings.enableCustomDonations"> <mat-form-field *ngIf="settings.enableCustomDonations">
<input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.enableCustomDonations" <input matInput placeholder="Custom Donation URL" [(ngModel)]="settings.enableCustomDonations" matTooltip="Set a custom message to be displayed in the navigation bar.">
matTooltip="Set a custom message to be displayed in the navigation bar.">
</mat-form-field> </mat-form-field>