Pull request #104: Scrollbar fixes for right containers
Merge in RED/ui from fixes to master * commit 'eda358c58f1d65f394723dd81e378a66f03380d7': Scrollbar fixes for right containers
This commit is contained in:
commit
b4e7c5e385
@ -1,5 +1,5 @@
|
|||||||
<div [class]="'container flex ' + direction">
|
<div [class]="'container flex ' + direction">
|
||||||
<svg attr.height="{{ size }}" attr.width="{{ size }}" attr.viewBox="0 0 {{ size }} {{ size }}" class="donut-chart">
|
<svg attr.height="{{ size }}" attr.width="{{ size }}" attr.viewBox="0 0 {{ size }} {{ size }}" [style.min-width]="size" class="donut-chart">
|
||||||
<g *ngFor="let value of parsedConfig; let i = index">
|
<g *ngFor="let value of parsedConfig; let i = index">
|
||||||
<circle
|
<circle
|
||||||
*ngIf="exists(i)"
|
*ngIf="exists(i)"
|
||||||
@ -27,7 +27,6 @@
|
|||||||
<div *ngFor="let val of parsedConfig" [class.active]="val.checked" [class.filter-disabled]="!filter" (click)="selectValue(val)">
|
<div *ngFor="let val of parsedConfig" [class.active]="val.checked" [class.filter-disabled]="!filter" (click)="selectValue(val)">
|
||||||
<redaction-status-bar
|
<redaction-status-bar
|
||||||
[small]="true"
|
[small]="true"
|
||||||
[labelClass]="'no-wrap'"
|
|
||||||
[config]="[
|
[config]="[
|
||||||
{
|
{
|
||||||
length: val.value,
|
length: val.value,
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
&.column {
|
&.column {
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
padding: 0 20px;
|
||||||
|
|
||||||
> *:not(:last-child) {
|
> *:not(:last-child) {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<div class="rectangle-container" [ngClass]="{ small: small }">
|
<div class="rectangle-container" [ngClass]="{ small: small }">
|
||||||
<div *ngFor="let rect of config" class="section-wrapper" [style]="'flex: ' + rect.length + ';'">
|
<div *ngFor="let rect of config" class="section-wrapper" [style]="'flex: ' + (rect.length || 1) + ';'">
|
||||||
<div
|
<div
|
||||||
[className]="'rectangle ' + rect.color"
|
[className]="'rectangle ' + rect.color"
|
||||||
[ngStyle]="{
|
[ngStyle]="{
|
||||||
'background-color': rect.color.includes('#') ? rect.color : ''
|
'background-color': rect.color.includes('#') ? rect.color : ''
|
||||||
}"
|
}"
|
||||||
></div>
|
></div>
|
||||||
<div *ngIf="rect.label" [ngClass]="labelClass">{{ rect.label }}</div>
|
<div *ngIf="rect.label">{{ rect.label }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -9,6 +9,7 @@
|
|||||||
&.small {
|
&.small {
|
||||||
.rectangle {
|
.rectangle {
|
||||||
width: 12px;
|
width: 12px;
|
||||||
|
min-width: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.section-wrapper {
|
.section-wrapper {
|
||||||
|
|||||||
@ -18,9 +18,6 @@ export class StatusBarComponent implements OnInit {
|
|||||||
@Input()
|
@Input()
|
||||||
public small = false;
|
public small = false;
|
||||||
|
|
||||||
@Input()
|
|
||||||
public labelClass = '';
|
|
||||||
|
|
||||||
constructor() {}
|
constructor() {}
|
||||||
|
|
||||||
ngOnInit(): void {}
|
ngOnInit(): void {}
|
||||||
|
|||||||
@ -159,7 +159,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right-container">
|
<div class="right-container" redactionHasScrollbar>
|
||||||
<redaction-simple-doughnut-chart
|
<redaction-simple-doughnut-chart
|
||||||
[config]="chartData"
|
[config]="chartData"
|
||||||
[strokeWidth]="15"
|
[strokeWidth]="15"
|
||||||
|
|||||||
@ -69,14 +69,10 @@ redaction-table-col-name::ng-deep {
|
|||||||
width: 353px;
|
width: 353px;
|
||||||
min-width: 353px;
|
min-width: 353px;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 50px 0;
|
padding: 50px 20px 30px 20px;
|
||||||
|
|
||||||
redaction-simple-doughnut-chart::ng-deep {
|
&.has-scrollbar:hover {
|
||||||
overflow-x: hidden;
|
padding-right: 9px;
|
||||||
|
|
||||||
> div {
|
|
||||||
min-width: 353px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right-container">
|
<div class="right-container" redactionHasScrollbar>
|
||||||
<div class="heading-xl" [translate]="'watermark-screen.title'"></div>
|
<div class="heading-xl" [translate]="'watermark-screen.title'"></div>
|
||||||
<form [formGroup]="configForm" (keyup)="configChanged()">
|
<form [formGroup]="configForm" (keyup)="configChanged()">
|
||||||
<div class="red-input-group w-300">
|
<div class="red-input-group w-300">
|
||||||
|
|||||||
@ -26,6 +26,10 @@
|
|||||||
border-left: none;
|
border-left: none;
|
||||||
border-right: 1px solid $separator;
|
border-right: 1px solid $separator;
|
||||||
|
|
||||||
|
&.has-scrollbar:hover {
|
||||||
|
padding-right: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
.heading-xl {
|
.heading-xl {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -116,7 +116,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right-container">
|
<div class="right-container" redactionHasScrollbar>
|
||||||
<redaction-project-listing-details
|
<redaction-project-listing-details
|
||||||
(filtersChanged)="filtersChanged($event)"
|
(filtersChanged)="filtersChanged($event)"
|
||||||
[documentsChartData]="documentsChartData"
|
[documentsChartData]="documentsChartData"
|
||||||
|
|||||||
@ -32,6 +32,11 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
width: 466px;
|
width: 466px;
|
||||||
min-width: 466px;
|
min-width: 466px;
|
||||||
|
padding-right: 11px;
|
||||||
|
|
||||||
|
&.has-scrollbar:hover {
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
redaction-project-listing-details {
|
redaction-project-listing-details {
|
||||||
min-width: 466px;
|
min-width: 466px;
|
||||||
|
|||||||
@ -249,7 +249,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="right-container" [class.collapsed]="collapsedDetails">
|
<div class="right-container" redactionHasScrollbar [class.collapsed]="collapsedDetails">
|
||||||
<redaction-project-details
|
<redaction-project-details
|
||||||
#projectDetailsComponent
|
#projectDetailsComponent
|
||||||
(openAssignProjectMembersDialog)="openAssignProjectMembersDialog()"
|
(openAssignProjectMembersDialog)="openAssignProjectMembersDialog()"
|
||||||
|
|||||||
@ -76,18 +76,10 @@ redaction-table-col-name::ng-deep {
|
|||||||
display: flex;
|
display: flex;
|
||||||
width: 375px;
|
width: 375px;
|
||||||
min-width: 375px;
|
min-width: 375px;
|
||||||
padding: 16px 16px 16px 24px;
|
padding: 16px 24px 16px 24px;
|
||||||
|
|
||||||
redaction-project-details {
|
&.has-scrollbar:hover {
|
||||||
width: 100%;
|
padding-right: 13px;
|
||||||
box-sizing: border-box;
|
|
||||||
padding-right: 11px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
redaction-project-details {
|
|
||||||
padding-right: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user