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

Merge branch 'develop' of https://github.com/Kareadita/Kavita into develop

Browse Source
This commit is contained in:
majora2007 2021-10-06 18:11:50 +00:00
commit ae53c2d5dd
3 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/Web/src/app/book-reader/book-reader/book-reader.component.html
View File

@ -100,14 +100,14 @@
</div>
<div #readingSection class="reading-section" [ngStyle]="{'padding-top': topOffset + 20 + 'px'}" [@isLoading]="isLoading ? true : false" (click)="handleReaderClick($event)">
<div #readingHtml [innerHtml]="page" *ngIf="page !== undefined"></div>
<div #readingHtml class="book-content" [ngStyle]="{'padding-bottom': topOffset + 20 + 'px'}" [innerHtml]="page" *ngIf="page !== undefined"></div>
<div class="left {{clickOverlayClass('left')}} no-observe" (click)="prevPage()" *ngIf="clickToPaginate">
</div>
<div class="right {{clickOverlayClass('right')}} no-observe" (click)="nextPage()" *ngIf="clickToPaginate">
</div>
<div [ngStyle]="{'padding-top': topOffset + 20 + 'px'}" *ngIf="page !== undefined && scrollbarNeeded">
<div *ngIf="page !== undefined && scrollbarNeeded">
<ng-container [ngTemplateOutlet]="actionBar"></ng-container>
</div>
</div>

69
UI/Web/src/app/book-reader/book-reader/book-reader.component.scss
View File

@ -49,6 +49,10 @@ $primary-color: #0062cc;
padding-right: 2px;
}
.fixed-top {
z-index: 1022;
}
.dark-mode {
color: #dcdcdc !important;
@ -92,6 +96,7 @@ $primary-color: #0062cc;
.reading-bar {
background-color: white;
overflow: hidden;
box-shadow: 0 0 6px 0 rgb(0 0 0 / 70%);
}
.dark-mode {
@ -101,6 +106,32 @@ $primary-color: #0062cc;
button {
background-color: $dark-form-background-no-opacity;
}
.btn {
&.btn-secondary {
border-color: transparent;
&:hover, &:focus {
border-color: #545b62;
}
}
&.btn-outline-secondary {
border-color: transparent;
&:hover, &:focus {
border-color: #545b62;
}
}
span {
background-color: unset;
}
i {
background-color: unset;
}
}
}
::ng-deep .dark-mode .drawer-container {
@ -173,4 +204,40 @@ $primary-color: #0062cc;
.highlight-2 {
background-color: rgba(65, 105, 225, 0.5) !important;
animation: fadein .5s both;
}
}
.btn {
&.btn-secondary {
border-color: transparent;
background-color: unset;
&:hover, &:focus {
border-color: #545b62;
}
}
&.btn-outline-secondary {
border-color: transparent;
background-color: unset;
&:hover, &:focus {
border-color: #545b62;
}
}
span {
background-color: unset;
color: #6c757d;
}
i {
background-color: unset;
color: #6c757d;
}
&:active {
* {
color: white;
}
}
}

2
UI/Web/src/app/shared/drawer/drawer.component.scss
View File

@ -13,7 +13,7 @@
height: 100vh;
background: var(--drawer-background-color);
transition: all 300ms;
box-shadow: -3px 0px 6px 1px #00000026;
box-shadow: 0 6px 4px 2px rgb(0 0 0 / 70%);
padding: 10px 10px;
z-index: 1021;
overflow: auto;