Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-7641' into 'master'

Browse Source 
RED-7641: Fixed weird scrollbars in license screen

Closes RED-7641

See merge request redactmanager/red-ui!118
This commit is contained in:
Dan Percic 2023-09-28 14:59:24 +02:00
commit 6478111524
8 changed files with 67 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.html
View File

@ -1,3 +1 @@
<div class="canvas-container">
<canvas [data]="chartData" [options]="chartOptions" [type]="'line'" baseChart></canvas>
</div>
<canvas [data]="chartData" [options]="chartOptions" [type]="'line'" baseChart height="400px" width="1000px"></canvas>

4
apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.scss
View File

@ -1,4 +0,0 @@
.canvas-container {
position: relative;
width: 1000px;
}

1
apps/red-ui/src/app/modules/admin/screens/license/components/chart/chart.component.ts
View File

@ -32,6 +32,7 @@ export class ChartComponent implements OnChanges {
#setChartOptions(): void {
this.chartOptions = {
responsive: false,
scales: {
y: {
stacked: true,

1
apps/red-ui/src/app/modules/admin/screens/license/components/license-analysis-capacity-usage/license-analysis-capacity-usage.component.scss
View File

@ -3,7 +3,6 @@
}
.grid-container {
width: calc(100% - 40px);
display: grid;
grid-template-columns: 250px 300px 1fr;
margin: 20px;

1
apps/red-ui/src/app/modules/admin/screens/license/components/license-page-usage/license-page-usage.component.scss
View File

@ -3,7 +3,6 @@
}
.grid-container {
width: calc(100% - 40px);
display: grid;
grid-template-columns: 250px 300px 1fr;
margin: 20px;

1
apps/red-ui/src/app/modules/admin/screens/license/components/license-retention-capacity-usage/license-retention-capacity.component.scss
View File

@ -3,7 +3,6 @@
}
.grid-container {
width: calc(100% - 40px);
display: grid;
grid-template-columns: 250px 300px 1fr;
margin: 20px;

12
apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html
View File

@ -1,13 +1,11 @@
<section class="settings">
<div>
<iqser-page-header
<iqser-page-header
(closeAction)="routerHistoryService.navigateToLastDossiersScreen()"
[buttonConfigs]="buttonConfigs"
[pageLabel]="'license-information' | translate"
[showCloseButton]="currentUser.isUser && permissionsService.has$(roles.dossiers.read) | async"
></iqser-page-header>
></iqser-page-header>
<div class="content-inner">
<div class="content-inner">
<div class="content-container">
<div *ngIf="licenseService.licenseData$ | async" class="grid-container">
<div class="row">
@ -76,6 +74,4 @@
<red-license-analysis-capacity-usage *ngIf="licenseService.isCapacityBased"></red-license-analysis-capacity-usage>
<red-license-retention-capacity *ngIf="licenseService.isCapacityBased"></red-license-retention-capacity>
</div>
</div>
</div>
</section>
</div>

5
apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss
View File

@ -4,12 +4,7 @@
overflow: auto;
@include common-mixins.scroll-bar;
display: flex;
flex-direction: column;
align-items: center;
.grid-container {
width: calc(100% - 40px);
display: grid;
grid-template-columns: 250px 300px 1fr;
margin: 20px;