Skip to content

Commit

Permalink
Merge commit '059ed498' into angular-18-milestone-rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
lukestanley committed Nov 10, 2024
2 parents 3513cfc + 059ed49 commit 3406250
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/app/blocks/variable-set/variable-set.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild} from '@angular/core';
import {clone, get, isObject} from 'lodash-es';
import {Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild} from '@angular/core';
import {clone, get, isArray, isObject} from 'lodash-es';
import stringify from 'json-stringify-safe';
import { MatSnackBar } from '@angular/material/snack-bar';
import {AppSettingsService} from '../../services/app-settings.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<mat-form-field>
<mat-label>placeholer</mat-label>
<mat-label>Placeholer</mat-label>
<input matInput [placeholder]="placeholder">
</mat-form-field>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h2>Import from Bloomen API</h2>

<mat-card appearance="outlined">
<mat-form-field style="margin-right: 1em;">
<mat-label>Publisher.</mat-label>
<mat-label>Publisher</mat-label>
<mat-select placeholder="Example user" [(ngModel)]="activeUser">
<mat-option [value]="'Publisher'">Publisher</mat-option>
<mat-option [value]="'Photographer'">Photographer</mat-option>
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/test-api-page/test-api-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2>Temporary page to test API</h2>

<mat-card appearance="outlined" *ngIf="entityList$ | async as entityList">
<mat-form-field style="margin-right: 0.5em;">
<mat-label>Entity ID.</mat-label>
<mat-label>Entity ID</mat-label>
<mat-select placeholder="Entity ID" (valueChange)="changeEntity($event)">
<mat-option *ngFor="let entity of entityList" [value]="entity.id">
{{ entity['id'] }}
Expand Down

0 comments on commit 3406250

Please sign in to comment.