You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/02/16 12:00:19 UTC
[incubator-datalab] branch develop updated: [DATALAB-2287] changed
scrollbar for some elements (#1074)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 3b467e6 [DATALAB-2287] changed scrollbar for some elements (#1074)
3b467e6 is described below
commit 3b467e60949e4e2596a0e24e8f92234cdf5701de
Author: Yurii Tykhun <yu...@ukr.net>
AuthorDate: Tue Feb 16 13:59:04 2021 +0200
[DATALAB-2287] changed scrollbar for some elements (#1074)
Co-authored-by: Yurii Tykhun <ty...@gmail.com>
---
.../administration/management/endpoints/endpoints.component.html | 2 +-
.../administration/management/endpoints/endpoints.component.scss | 4 +++-
.../administration/project/project-form/project-form.component.html | 4 ++--
.../src/app/resources/bucket-browser/bucket-browser.component.html | 6 +++---
.../create-environment/create-environment.component.html | 4 ++--
.../exploratory/install-libraries/install-libraries.component.html | 2 +-
.../resources/webapp/src/app/resources/resources.component.html | 2 +-
.../notification-dialog/notification-dialog.component.ts | 2 +-
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
index 2993f6d..2181f9b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
@@ -106,7 +106,7 @@
</div>
</mat-tab>
<mat-tab label="ENDPOINTS LIST">
- <div class="endpoints">
+ <div class="endpoints scrolling">
<table mat-table [dataSource]="endpoints" class="endpoints-table" *ngIf="endpoints?.length; else empty">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef class="name"> Endpoint name </th>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
index bcf53a8..53eaaf6 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
@@ -50,7 +50,9 @@
}
.endpoints {
- height: 265px;
+ height: 310px;
+ padding-right: 5px;
+ overflow: auto;
table.mat-table {
width: 100%;
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 8b05c28..13f924a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -93,7 +93,7 @@
<div class="control selector-wrapper">
<mat-form-field>
<mat-select multiple formControlName="endpoints" placeholder="Select endpoints"
- panelClass="crete-project-dialog">
+ panelClass="crete-project-dialog scrolling">
<mat-option class="multiple-select" disabled>
<a class="select ani" (click)="selectOptions(endpointsList, 'endpoints', 'all')">
<i class="material-icons">playlist_add_check</i> All
@@ -138,7 +138,7 @@
<div class="control selector-wrapper">
<mat-form-field>
<mat-select multiple formControlName="groups" placeholder="Select user groups"
- panelClass="crete-project-dialog">
+ panelClass="crete-project-dialog scrolling">
<mat-option class="multiple-select" disabled>
<a class="select ani" (click)="selectOptions(groupsList, 'groups', 'all')">
<i class="material-icons">playlist_add_check</i> All
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
index a86a573..2a1fdd1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
@@ -121,7 +121,7 @@
>
</datalab-bucket-tree>
</div>
- <div class="navigation" [ngClass]="{'selection-opened': isSelectionOpened}" [hidden]="!path">
+ <div class="navigation scrolling" [ngClass]="{'selection-opened': isSelectionOpened}" [hidden]="!path">
<datalab-folder-tree
(showFolderContent)=onFolderClick($event)
(disableAll)=dissableAll($event)
@@ -150,7 +150,7 @@
<div class="date"><span class="th_date">Last modified</span></div>
</div>
</div>
- <ul class="folder-tree" [ngClass]="{'cursor-not-allow': bucketDataService.emptyFolder}">
+ <ul class="folder-tree scrolling" [ngClass]="{'cursor-not-allow': bucketDataService.emptyFolder}">
<li *ngFor="let file of folderItems" class="folder-item" [ngClass]="{'not-allowed': bucketDataService.emptyFolder}">
<div class="folder-item-wrapper" *ngIf="file.children && file.item" (click)="showItem(file)">
<div class="name name-folder">
@@ -216,7 +216,7 @@
<button type="button" class="close" (click)="closeUploadWindow()" [disabled]="isFileUploading" [ngClass]="{'not-allow': isFileUploading}" >×</button>
</span>
</header>
- <ul class="upload-files">
+ <ul class="upload-files scrolling">
<li class="file upload-table-header" *ngIf="addedFiles.length">
<div class="name ellipsis" >File</div>
<div class="second-block">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index eabff73..fb3a0a3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@ -71,7 +71,7 @@
<span class="form-field-wrapper" [ngClass]="{ 'not-active' : !templates.length || (templates.length === 0 && this.createExploratoryForm.controls.endpoint.value)}">
<mat-form-field>
<mat-select formControlName="version" disableOptionCentering [disabled]="!templates.length || (templates.length === 0 && this.createExploratoryForm.controls.endpoint.value)"
- panelClass="create-resources-dialog" placeholder="Select template">
+ panelClass="create-resources-dialog scrolling" placeholder="Select template">
<mat-option *ngFor="let template of templates"
[value]="template.exploratory_environment_versions[0].version" (click)="getShapes(template)">
{{ template.exploratory_environment_versions[0].template_name }}
@@ -136,7 +136,7 @@
<mat-form-field>
<mat-label>Select instance size</mat-label>
<mat-select formControlName="shape" disableOptionCentering [disabled]="!currentTemplate || !areShapes && currentTemplate"
- panelClass="create-resources-shapes" placeholder="Instance size">
+ panelClass="create-resources-shapes scrolling" placeholder="Instance size">
<mat-optgroup *ngFor="let item of (shapes | keys)" [label]="item.key | underscoreless">
<mat-option *ngFor="let list_item of item.value" [value]="list_item.Type">
<strong class="highlight icon-label">{{ list_item.Size }}</strong> {{ list_item.Type }}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index 43a2dcb..4b045fc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -69,7 +69,7 @@
class="library-input"
>
</div>
- <mat-autocomplete #auto="matAutocomplete" class="suggestions" >
+ <mat-autocomplete #auto="matAutocomplete" class="suggestions scrolling">
<ng-template ngFor let-item [ngForOf]="filteredList" let-i="index">
<mat-option>
<div class="option" (click)="selectLibrary(item);$event.stopPropagation()" [ngClass]="{'not-allow': item.isInSelectedList}">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
index 8a15434..c112ff9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
@@ -35,7 +35,7 @@
<div class="control selector-wrapper" *ngIf="projects?.length">
<mat-form-field>
<mat-label>Select project</mat-label>
- <mat-select [(value)]="resourcesGrid.activeProject">
+ <mat-select [(value)]="resourcesGrid.activeProject" panelClass="scrolling">
<mat-option *ngIf="projects?.length > 1" (click)="setActiveProject('')">Show all</mat-option>
<mat-option *ngFor="let project of projects" [value]="project"
(click)="setActiveProject(project)">
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index ea00d71..a00e70e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -29,7 +29,7 @@ import {Endpoint} from '../../../administration/project/project.component';
<h4 class="modal-title"><i class="material-icons">priority_high</i>Warning</h4>
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div mat-dialog-content class="content message">
+ <div mat-dialog-content class="content message scrolling">
<div *ngIf="data.type === 'terminateNode'" class="table-header">
<div *ngIf="data.item.action.endpoint.length > 0">
Edge node<span *ngIf="data.item.action.endpoint.length>1">s</span> <span class="strong">{{ data.item.action.endpoint.join(', ') }}</span> in project
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org