Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-31 14:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged develop into main to fix the issues

Browse Source
This commit is contained in:
Joseph Milazzo 2023-05-06 09:01:20 -05:00
commit 642b23ed61
5 changed files with 188 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API/Controllers/ReaderController.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;

1
UI/Web/src/app/nav/_components/nav-header/nav-header.component.html
View File

@ -170,4 +170,3 @@
</ng-container> </ng-container>
</div> </div>
</nav> </nav>

8
UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html
View File

@ -32,9 +32,9 @@
</div> </div>
</div> </div>
</div> </div>
</ng-template> </ng-template>
</app-side-nav-companion-bar> </app-side-nav-companion-bar>
<div class="container-fluid mt-2" *ngIf="readingList" > <div class="container-fluid mt-2" *ngIf="readingList" >
<div class="row mb-3"> <div class="row mb-3">
<div class="col-md-2 col-xs-4 col-sm-6 d-none d-sm-block" *ngIf="readingList.coverImage !== '' && readingList.coverImage !== undefined && readingList.coverImage !== null"> <div class="col-md-2 col-xs-4 col-sm-6 d-none d-sm-block" *ngIf="readingList.coverImage !== '' && readingList.coverImage !== undefined && readingList.coverImage !== null">
@ -131,4 +131,4 @@
</ng-template> </ng-template>
</app-draggable-ordered-list> </app-draggable-ordered-list>
</div> </div>
</div> </div>