forked from comixed/comixed
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed the excessivey scrollbars in the app [comixed#823]
- Loading branch information
Showing
9 changed files
with
82 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,34 @@ | ||
<div id="cx-navigation-bar" class="cx-width-100 cx-height-100"> | ||
<div *ngIf="busy" class="cx-overlay"> | ||
<div class="cx-centered"> | ||
<mat-progress-spinner | ||
diameter="100" | ||
mode="indeterminate" | ||
color="accent" | ||
></mat-progress-spinner> | ||
</div> | ||
<div | ||
*ngIf="busy" | ||
id="cx-navigation-bar" | ||
class="cx-overlay cx-width-100 cx-height-100" | ||
> | ||
<div class="cx-centered"> | ||
<mat-progress-spinner | ||
diameter="100" | ||
mode="indeterminate" | ||
color="accent" | ||
></mat-progress-spinner> | ||
</div> | ||
<cx-navigation-bar | ||
[user]="user" | ||
[sidebarOpened]="sidenav.opened" | ||
(toggleSidebar)="sidenav.toggle($event)" | ||
></cx-navigation-bar> | ||
<div class="cx-width-100 cx-height-100 cx-overflow-y-scroll"> | ||
<mat-sidenav-container class="cx-width-100 cx-height-100"> | ||
<mat-sidenav #sidenav mode="side" class="cx-primary-dark-background"> | ||
<cx-side-navigation | ||
class="cx-vertical-scrolling cx-height-100" | ||
[user]="user" | ||
></cx-side-navigation> | ||
</mat-sidenav> | ||
<mat-sidenav-content #sidebar> | ||
<div | ||
id="cx-main-content-area" | ||
class="cx-width-100 cx-height-100 cx-footer-margin" | ||
> | ||
<router-outlet></router-outlet> | ||
</div> | ||
</mat-sidenav-content> | ||
</mat-sidenav-container> | ||
</div> | ||
<cx-footer id="cx-footer" class="cx-padding-left-5" [user]="user"></cx-footer> | ||
</div> | ||
|
||
<mat-sidenav-container class="cx-width-100 cx-height-100 cx-navbar-margin"> | ||
<mat-sidenav #sidenav class="cx-primary-dark-background" mode="over"> | ||
<cx-side-navigation [user]="user"></cx-side-navigation> | ||
</mat-sidenav> | ||
<mat-sidenav-content #sidebar class="cx-width-100 cx-overflow-y-scroll"> | ||
<cx-navigation-bar | ||
[user]="user" | ||
[sidebarOpened]="sidenav.opened" | ||
(toggleSidebar)="sidenav.toggle($event)" | ||
></cx-navigation-bar> | ||
|
||
<router-outlet></router-outlet> | ||
|
||
<cx-footer | ||
id="cx-footer" | ||
class="cx-padding-left-5" | ||
[user]="user" | ||
></cx-footer> | ||
</mat-sidenav-content> | ||
</mat-sidenav-container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...ui/src/app/comic-pages/pages/blocked-hash-list-page/blocked-hash-list-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 35 additions & 37 deletions
72
comixed-webui/src/app/library/components/comic-covers/comic-covers.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
comixed-webui/src/app/library/components/library-toolbar/library-toolbar.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
comixed-webui/src/app/library/pages/library-page/library-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
<cx-comic-covers | ||
class="cx-overflow-y-scroll" | ||
[comics]=" | ||
comics | ||
| archiveType: archiveTypeFilter | ||
|
4 changes: 3 additions & 1 deletion
4
comixed-webui/src/app/lists/pages/reading-lists-page/reading-lists-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters