AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Last Polish before Stable (#3167)

Browse source 
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo 2024-09-15 12:15:39 -05:00 • committed by GitHub
parent f17ecbf305
commit cabb27fb74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 64 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

24
UI/Web/src/_card-item-common.scss
View file

@ -160,16 +160,15 @@ $image-width: 160px;
.card-title-container {
display: flex;
justify-content: end;
justify-content: space-between;
align-items: center;
padding: 0 5px;
.card-title {
font-size: 0.8rem;
margin: 0;
padding: 10px 0;
text-align: center;
max-width: 120px;
max-width: 110px;
a {
overflow: hidden;
@ -178,14 +177,28 @@ $image-width: 160px;
}
}
.card-actions {
min-width: 15.82px;
}
.card-format {
min-width: 22px;
}
::ng-deep app-card-actionables .dropdown .dropdown-toggle {
padding: 0 5px;
}
.meta-title {
.card-title {
max-width: unset;
}
}
.card-title {
font-size: 0.8rem;
margin: 0;
padding: 10px;
padding: 10px 0;
text-align: center;
max-width: 120px;
@ -208,6 +221,9 @@ $image-width: 160px;
.overlay-information {
visibility: hidden;
display: none;
.card-title {
padding: 10px;
}
}
.chapter,

19
UI/Web/src/app/cards/card-item/card-item.component.html
View file

@ -73,9 +73,11 @@
</div>
@if (title.length > 0 || actions.length > 0) {
<div class="card-title-container">
@if (showFormat) {
<app-series-format [format]="format"></app-series-format>
}
<span class="card-format">
@if (showFormat) {
<app-series-format [format]="format"></app-series-format>
}
</span>
<span class="card-title" placement="top" id="{{title}}_{{entity.id}}" [ngbTooltip]="tooltipTitle" (click)="handleClick($event)" tabindex="0">
@if (isPromoted(); as isPromoted) {
@ -87,14 +89,13 @@
{{title}}
}
</span>
<span class="card-actions">
@if (actions && actions.length > 0) {
<span class="card-actions">
<app-card-actionables (actionHandler)="performAction($event)" [actions]="actions" [labelBy]="title"></app-card-actionables>
</span>
} @else {
}
<app-card-actionables (actionHandler)="performAction($event)" [actions]="actions" [labelBy]="title"></app-card-actionables>
}
</span>
</div>
}
</div>

4
UI/Web/src/app/cards/card-item/card-item.component.scss
View file

@ -1,5 +1 @@
@use '../../../card-item-common';
.card-title-container {
justify-content: center;
}

7
UI/Web/src/app/cards/chapter-card/chapter-card.component.html
View file

@ -73,6 +73,8 @@
<div class="card-title-container">
<span class="card-format">
</span>
<span class="card-title" id="{{chapter.id}}" tabindex="0" [ngbTooltip]="chapter.isSpecial ? (chapter.title || chapter.range) : null">
<a class="dark-exempt btn-icon" routerLink="/library/{{libraryId}}/series/{{seriesId}}/chapter/{{chapter.id}}">
@if (chapter.isSpecial) {
@ -82,12 +84,11 @@
}
</a>
</span>
<span class="card-actions">
@if (actions && actions.length > 0) {
<span class="card-actions">
<app-card-actionables (actionHandler)="performAction($event)" [actions]="actions" [labelBy]="chapter.titleName"></app-card-actionables>
</span>
}
</span>
</div>
</div>

6
UI/Web/src/app/cards/external-series-card/external-series-card.component.html
View file

@ -19,14 +19,16 @@
<div class="card-title-container">
@if (data.name.length > 0) {
<img class="me-1" [ngSrc]="data.provider | providerImage" width="20" height="20" alt="">
<a #link class="card-title" [href]="data.url" target="_blank" rel="noreferrer nofollow">
<span class="card-title" placement="top" id="{{data.name}}" [ngbTooltip]="data.name" (click)="handleClick()" tabindex="0">
<img class="me-1" [ngSrc]="data.provider | providerImage" width="20" height="20" alt="">
{{data.name}}
</span>
</a>
}
}
<span class="card-actions">
</span>
</div>
</div>

2
UI/Web/src/app/cards/external-series-card/external-series-card.component.scss
View file

@ -9,6 +9,6 @@ a {
}
.card-title {
padding: 5px;
padding: 5px 0;
max-width: unset;
}

10
UI/Web/src/app/cards/volume-card/volume-card.component.html
View file

@ -52,13 +52,23 @@
@if (libraryType === LibraryType.LightNovel || libraryType === LibraryType.Book) {
<div class="card-body meta-title">
<span class="card-format">
</span>
<div class="card-content d-flex justify-content-center align-items-center text-center" style="width:100%;min-height:58px;">
{{volume.name}}
</div>
@if (actions && actions.length > 0) {
<span class="card-actions">
<app-card-actionables (actionHandler)="performAction($event)" [actions]="actions" [labelBy]="volume.name"></app-card-actionables>
</span>
}
</div>
}
<div class="card-title-container">
<span class="card-format">
</span>
<span class="card-title" id="{{volume.id}}" tabindex="0">
<a class="dark-exempt btn-icon" routerLink="/library/{{libraryId}}/series/{{seriesId}}/volume/{{volume.id}}">
{{volume.name}}

1
UI/Web/src/app/reading-list/_components/import-cbl/import-cbl.component.html
View file

@ -10,6 +10,7 @@
@case (Step.Import) {
<div class="row g-0">
<p>{{t('import-description')}}</p>
<p>{{t('cbl-repo') | safeHtml}}</p>
<form [formGroup]="uploadForm" enctype="multipart/form-data">
<file-upload formControlName="files"></file-upload>
</form>

4
UI/Web/src/assets/langs/en.json
View file

@ -740,7 +740,8 @@
"required-field": "{{common.required-field}}",
"valid-email": "{{common.valid-email}}",
"password-validation": "{{validation.password-validation}}",
"register": "Register"
"register": "Register",
"error-label": "Error:"
},
"confirm-email-change": {
@ -1461,6 +1462,7 @@
"theme": "Theme",
"customize": "Customize",
"cbl-import": "CBL Reading List",
"cbl-repo": "You can find many reading lists in the community <a href='https://github.com/DieselTech/CBL-ReadingLists' target='_blank' rel='noopener noreferrer'>repo</a>.",
"mal-stack-import": "MAL Stack"
},