benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

fix textarea font

Browse Source
This commit is contained in:
smuddyx
2024-02-17 16:00:31 +01:00
parent 8a9e2d58c5
commit a364536127
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/modules/shows/show/song/song.component.html
View File

@@ -24,6 +24,7 @@
<mat-form-field *ngIf="edit" appearance="outline"> <mat-form-field *ngIf="edit" appearance="outline">
<mat-label>Songtext</mat-label> <mat-label>Songtext</mat-label>
<textarea matTooltip="Tonart ändern" <textarea matTooltip="Tonart ändern"
class="edit"
[cdkTextareaAutosize]="true" [cdkTextareaAutosize]="true"
[formControl]="editSongControl" [formControl]="editSongControl"
matInput matInput

2
src/app/modules/shows/show/song/song.component.less
View File

@@ -78,6 +78,6 @@ button {
} }
textarea { textarea.edit {
font-family: 'Ubuntu Mono', monospace; font-family: 'Ubuntu Mono', monospace;
} }

5
src/app/modules/songs/song-list/song-list.component.ts
View File

@@ -1,7 +1,7 @@
import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core'; import {ChangeDetectionStrategy, Component, OnDestroy, OnInit} from '@angular/core';
import {SongService} from '../services/song.service'; import {SongService} from '../services/song.service';
import {Song} from '../services/song'; import {Song} from '../services/song';
import {map} from 'rxjs/operators'; import {map, tap} from 'rxjs/operators';
import {combineLatest, Observable} from 'rxjs'; import {combineLatest, Observable} from 'rxjs';
import {fade} from '../../../animations'; import {fade} from '../../../animations';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
@@ -21,6 +21,7 @@ export class SongListComponent implements OnInit, OnDestroy {
public songs$: Observable<Song[]> | null = combineLatest([ public songs$: Observable<Song[]> | null = combineLatest([
this.activatedRoute.queryParams.pipe(map(_ => _ as FilterValues)), this.activatedRoute.queryParams.pipe(map(_ => _ as FilterValues)),
this.activatedRoute.data.pipe( this.activatedRoute.data.pipe(
tap(_ => console.log(_)),
map(data => data.songList as Song[]), map(data => data.songList as Song[]),
map(songs => songs.sort((a, b) => a.number - b.number)) map(songs => songs.sort((a, b) => a.number - b.number))
), ),
@@ -29,7 +30,7 @@ export class SongListComponent implements OnInit, OnDestroy {
const songs = _[1]; const songs = _[1];
const filter = _[0]; const filter = _[0];
this.anyFilterActive = this.checkIfFilterActive(filter); this.anyFilterActive = this.checkIfFilterActive(filter);
return songs.filter(song => this.filter(song, filter)).sort((a, b) => a.title.localeCompare(b.title)); return songs.filter(song => this.filter(song, filter)).sort((a, b) => a.title?.localeCompare(b.title));
}) })
); );
public anyFilterActive = false; public anyFilterActive = false;