Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/assets 8: add missing scrollbars #40

Merged
merged 5 commits into from
Mar 13, 2024
Merged

Feature/assets 8: add missing scrollbars #40

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c00da31
assets-8: add scrollbars to all tabs in assets editor and user manage…
TIL-EBP Mar 7, 2024
861ccd6
assets-8: remove some duplicate attributes
TIL-EBP Mar 7, 2024
79f4caa
assets-8: fix unchanged files with annotations
TIL-EBP Mar 13, 2024
259b2f0
assets-8: fix unchanged files with annotations
TIL-EBP Mar 13, 2024
56c1774
assets-8: fix unchanged files with annotations
ga-ebp Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions libs/admin/src/lib/components/admin-page/admin-page.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ mat-progress-bar {
width: calc(100% - 1rem);
}

.user-list {
height: calc(100% - 4.5rem);
overflow-y: scroll;
}

asset-sg-user-collapsed,
asset-sg-user-expanded {
margin-bottom: 1rem;
Expand Down
6 changes: 3 additions & 3 deletions ...components/asset-editor-tab-administration/asset-editor-tab-administration.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<ng-container *rxLet="_referenceDataVM$; let referenceDataVM">
<div class="flex flex-row max-h-full">
<div class="flex flex-column form-column mb-12 mr-8">
<div class="flex flex-column bg-white py-4 px-6 max-h-full">
<div class="font-bold mb-4" translate translate>edit.tabs.administration.infoGeol</div>
<div class="flex flex-column bg-white py-4 px-6 max-h-full overflow-y-scroll">
<div class="font-bold mb-4" translate>edit.tabs.administration.infoGeol</div>
<mat-form-field class="readonly">
<mat-label translate translate>edit.tabs.administration.sgsId</mat-label>
<mat-label translate>edit.tabs.administration.sgsId</mat-label>
<input matInput [value]="_form.controls['sgsId'].value" [readonly]="true" />
</mat-form-field>
<mat-form-field class="readonly" floatLabel="always">
Expand Down
4 changes: 2 additions & 2 deletions ...tor/src/lib/components/asset-editor-tab-contacts/asset-editor-tab-contacts.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
<ng-container *ngIf="uiMode !== 'view'">
<ng-container *ngIf="getForm(uiMode); let form">
<form *ngIf="form" [formGroup]="form">
<div class="flex flex-column form-column mb-12">
<div class="flex flex-column bg-white py-4 px-6 max-h-full">
<div class="flex flex-column form-column mb-12 max-h-full ">
<div class="flex flex-column bg-white py-4 px-6 overflow-y-scroll">
<mat-form-field
class="mb-2"
*ngIf="uiMode === 'linkExisting' || uiMode === 'linkNew'">
Expand Down
4 changes: 2 additions & 2 deletions ...ditor/src/lib/components/asset-editor-tab-general/asset-editor-tab-general.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ng-container *rxLet="_referenceDataVM$ | push; let vm">
<form [formGroup]="_form" class="flex flex-row max-h-full">
<div class="flex flex-column form-column mr-8">
<div class="flex flex-column bg-white mb-4 py-4 px-6">
<div class="flex flex-column bg-white mb-4 py-4 px-6 overflow-y-scroll">
<div class="font-bold mb-4" translate>edit.tabs.general.title</div>
<mat-form-field class="mb-2">
<mat-label translate>edit.tabs.general.publicTitle</mat-label>
Expand Down Expand Up @@ -89,7 +89,7 @@
</div>
</div>
<div class="flex flex-column form-column mr-8">
<div class="flex flex-column bg-white mb-4 py-4 px-6">
<div class="flex flex-column bg-white mb-4 py-4 px-6 overflow-y-scroll">
<div class="font-bold mb-4" translate>edit.tabs.general.topic</div>
<asset-sg-multiselect
formControlName="manCatLabelRefs"
Expand Down
2 changes: 1 addition & 1 deletion ...sset-editor/src/lib/components/asset-editor-tab-page/asset-editor-tab-page.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ form {

::ng-deep {
[role='tabpanel'] {
height: 100%;
height: calc(100% - 4rem);
& > * {
height: calc(100% - 1rem);
}
Expand Down
4 changes: 2 additions & 2 deletions ...et-editor/src/lib/components/asset-editor-tab-usage/asset-editor-tab-usage.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ng-container *rxLet="_referenceDataVM$ | push; let vm">
<form [formGroup]="_form" class="flex flex-row">
<form [formGroup]="_form" class="flex flex-row max-h-full">
<div class="flex flex-column form-column mr-8">
<div class="flex flex-column bg-white mb-4 py-4 px-6">
<div class="flex flex-column bg-white mb-4 py-4 px-6 overflow-y-scroll ">
<div class="font-bold mb-4" translate>edit.tabs.usage.internalUsage</div>
<div *ngIf="_form.controls['publicUse'].value" class="flex mb-2 bg-orange-01 px-3 py-2">
<svg-icon key="warning-filled" class="mr-3"></svg-icon
Expand Down
5 changes: 5 additions & 0 deletions ...et-editor/src/lib/components/asset-editor-tab-usage/asset-editor-tab-usage.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@use '../../styles/variables';
@use '../../styles/mixins';

:host {
display: block;
padding: 0 1rem 1rem 0;
}

.form-column {
width: 34rem;
}
Expand Down
Loading