This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b708f4b375e9d5d011fc25f2d67e821ba40dbe03 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Tue Jun 4 14:10:27 2019 +0300 [DLAB-386]: change marckup; fixed empty lists default options --- .../project/project-form/project-form.component.html | 4 ++-- .../webapp/src/app/administration/project/project.component.html | 7 +++---- .../exploratory-environment-create-dialog.component.html | 8 ++++---- services/self-service/src/main/resources/webapp/src/styles.scss | 3 +++ 4 files changed, 12 insertions(+), 10 deletions(-) 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 7791fac..85ea1c5 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 @@ -53,7 +53,7 @@ <mat-option *ngFor="let endpoint of endpointsList" [value]="endpoint.name"> {{ endpoint.name }} </mat-option> - <mat-option *ngIf="!endpointsList.length" class="multiple-select empty" disabled>Endpoints list is empty</mat-option> + <mat-option *ngIf="!endpointsList.length" class="multiple-select empty ml-10" disabled>Endpoints list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -91,7 +91,7 @@ <mat-option *ngFor="let group of groupsList" [value]="group"> {{ group }} </mat-option> - <mat-option *ngIf="!groupsList.length" class="multiple-select" disabled>Groups list is empty</mat-option> + <mat-option *ngIf="!groupsList.length" class="multiple-select ml-10" disabled>Groups list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index ed23dcf..d8f10ab 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -18,8 +18,8 @@ --> -<div *ngIf="projectList"> - <div class="sub-nav base-retreat"> +<div *ngIf="projectList" class="base-retreat"> + <div class="sub-nav"> <div> <button mat-raised-button class="butt butt-create" (click)="createProject()" [disabled]="!projectList.length"> <i class="material-icons">add</i>Create new @@ -32,10 +32,9 @@ </div> </div> <mat-card class="base-retreat project-form" *ngIf="!projectList.length"> - <mat-divider></mat-divider> <project-form></project-form> </mat-card> - + <mat-divider></mat-divider> <div [hidden]="!projectList.length"> <project-list (editItem)="editProject($event)" (deleteItem)="deleteProject($event)"></project-list> </div> diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html index b5b9687..432e71d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html @@ -32,7 +32,7 @@ <mat-label>Select project</mat-label> <mat-select formControlName="project" disableOptionCentering> <mat-option *ngFor="let project of projects" [value]="project.name" (click)="getTemplates($event, project)">{{ project.name }}</mat-option> - <mat-option *ngIf="!projects.length" class="multiple-select" disabled>Projects list is empty</mat-option> + <mat-option *ngIf="!projects.length" class="multiple-select ml-10" disabled>Projects list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -48,7 +48,7 @@ <mat-label>Select endpoint</mat-label> <mat-select formControlName="endpoint" disableOptionCentering> <mat-option *ngFor="let endpoint of endpoints" [value]="endpoint">{{ endpoint }}</mat-option> - <mat-option *ngIf="!endpoints.length" class="multiple-select" disabled>Endpoints list is empty</mat-option> + <mat-option *ngIf="!endpoints.length" class="multiple-select ml-10" disabled>Endpoints list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -68,7 +68,7 @@ (click)="getShapes(template)"> {{ template.exploratory_environment_versions[0].template_name }} </mat-option> - <mat-option *ngIf="!templates.length" class="multiple-select" disabled>Templates list is empty</mat-option> + <mat-option *ngIf="!templates.length" class="multiple-select ml-10" disabled>Templates list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> @@ -85,7 +85,7 @@ <mat-select formControlName="notebook_image_name" disableOptionCentering> <mat-option [value]="null">None</mat-option> <mat-option *ngFor="let image of images" [value]="image.name">{{ image.name }}</mat-option> - <mat-option *ngIf="!images.length" class="multiple-select" disabled>Images list is empty</mat-option> + <mat-option *ngIf="!images.length" class="multiple-select ml-10" disabled>Images list is empty</mat-option> </mat-select> <button class="caret"> <i class="material-icons">keyboard_arrow_down</i> diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 78972f4..78f7f63 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -280,6 +280,9 @@ input[type='number'] { .m-top-10p { margin-top: 10%; } +.ml-10 { + margin-left: 10px; +} .full-height { height: 100%; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
