Skip to content

Commit

Permalink
scrollbar
Browse files Browse the repository at this point in the history
  • Loading branch information
ToWipf committed Jul 2, 2024
1 parent 3f5b441 commit f1bef85
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 17 deletions.
28 changes: 17 additions & 11 deletions angular-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions angular-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jasmarty-app",
"version": "2.2.6",
"version": "2.2.7",
"scripts": {
"ng": "ng",
"start": "ng serve --host 0.0.0.0 --port 3000 --disable-host-check",
Expand Down Expand Up @@ -30,7 +30,7 @@
"javascript-blowfish": "1.0.4",
"ngx-color-picker": "16.0.0",
"ngx-photo-editor": "0.4.4",
"ngx-scrollbar": "15.0.1",
"ngx-scrollbar": "10.0.1",
"rxjs": "7.8.1",
"zone.js": "0.14.3"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
padding-left: 4px;
padding-top: 4px;
padding-right: 4px;
height: calc(100% - 25px);
background-color: rgb(192, 192, 192);
height: 100%;
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3>Daylog {{dateForLoad?.date}}</h3>
<ng-scrollbar class="pscrollTabellen" track="horizontal">
<div class="gridRow_ohne_rand">
<div class="tabelleR" [ngClass]="{'hide': !bShowDayTable }">
<ng-scrollbar class="pscroll" track="vertical" autoWidthDisabled="false">
<ng-scrollbar class="pscroll" track="vertical">
<table mat-table [dataSource]="daylistDataSource" matSort matSortActive="date" matSortDirection="desc" class="mat-elevation-z8">
<ng-container matColumnDef="id">
<th mat-header-cell *matHeaderCellDef mat-sort-header>ID</th>
Expand Down Expand Up @@ -135,7 +135,7 @@ <h3>Daylog {{dateForLoad?.date}}</h3>
</ng-scrollbar>
</div>
<div class="tabelleL">
<ng-scrollbar class="pscroll" track="vertical" autoWidthDisabled="false">
<ng-scrollbar class="pscroll" track="vertical">
<app-daylog-eventlist [filterEventType]="selectedEventTypeFilter" [filterTextEvent]="sFilterTextEvent" [showAllTableColumns]="bShowAllTableColumns" [dateForLoad]="dateForLoad" [daylogTypes]="daylogTypes"></app-daylog-eventlist>
</ng-scrollbar>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wipf/jasmarty/logic/base/MainHome.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class MainHome {
AuthKeyService authKeyService;

private static final Logger LOGGER = Logger.getLogger("_MainHome_");
public static final String VERSION = "2.2.6";
public static final String VERSION = "2.2.7";
public static final String AUTH_KEY_NAME = "authKey";

/**
Expand Down

0 comments on commit f1bef85

Please sign in to comment.