Skip to content

Features/some debugs #12

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

Open
euskanani wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Features/some debugs #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
358c3ce
[some-debugs] div scroll fix on topology-oveview and module view ap…
Sep 5, 2019
7f61998
[some-debugs] Tabs label customize , test ViewEncapsulation
Sep 5, 2019
c774b6e
[some-debugs] hide scroll bar on catalog list items (windows pc)
Sep 5, 2019
b6fc0f0
[some-debugs] div scroll fix on topology-oveview and module view apap…
Sep 5, 2019
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
4 changes: 2 additions & 2 deletions ...d-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
</mat-card-subtitle>
</mat-card-header>
<mat-card-content>
<div style="overflow-y:scroll; height:80px;margin-top: 10px;color: grey;text-align: center;">
<div class ="description" style="overflow-y:scroll; overflow-x:hidden ;height:80px;margin-top: 10px;color: grey;text-align: center;">
{{catalog.description}}
</div>
<div class="metaproperties" style="overflow-y:scroll;height:60px;margin-top: 12px;text-align: center;">
<div class="metaproperties" style="overflow-y:scroll;overflow-x:hidden ; height:60px;margin-top: 12px;text-align: center;">
<mat-chip-list>
<ng-container *ngFor="let namedMetaProperty of catalog.metaProperties | keyvalue;">
<mat-chip
Expand Down
9 changes: 9 additions & 0 deletions ...d-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ From old alien
}


.description::-webkit-scrollbar {
background: transparent ;
}

.metaproperties::-webkit-scrollbar{
background: transparent ;
}





20 changes: 10 additions & 10 deletions .../src/main/webapp/app/shared/components/topology-overview/topology-overview.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<mat-icon *ngIf="displayGraph">format_align_justify</mat-icon>
</button>
</div>
<div *ngIf="!displayGraph" class="desciption w4c-borders mat-app-background" fxFlex="100%">
<div *ngIf="!displayGraph" class="desciption w4c-borders mat-app-background">
<span>{{ overview.description }}</span>
</div>
<div *ngIf="displayGraph" class="desciption w4c-borders" fxFlex="100%">
Expand Down Expand Up @@ -40,15 +40,15 @@
</ng-container>
<ng-container matColumnDef="typeName">
<th mat-header-cell *matHeaderCellDef> Type </th>
<td mat-cell *matCellDef="let element" matTooltip="{{element.nodeType.description}}">
{{element.nodeType.elementId|w4cToscaTypeShortName}}
</td>
</ng-container>
<ng-container matColumnDef="version">
<th mat-header-cell *matHeaderCellDef> Version </th>
<td mat-cell *matCellDef="let element"
matTooltip="{{element.nodeType.archiveName}}:{{element.nodeType.archiveVersion}}">
{{element.nodeType.archiveVersion}}
<td mat-cell *matCellDef="let element" >
<div fxLayout="column">
<div matTooltip="{{element.nodeType.description}}">
{{element.nodeType.elementId|w4cToscaTypeShortName}}
</div>
<div style="font-size: 10px; color:grey;" matTooltip="{{element.nodeType.archiveName}}:{{element.nodeType.archiveVersion}}">
{{element.nodeType.archiveVersion}}
</div>
</div>
</td>
</ng-container>
<ng-container matColumnDef="icon">
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/webapp/app/shared/components/topology-overview/topology-overview.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.desciption {
height: 300px;
height: 320px;
overflow-y: scroll;
padding: 5px;
margin: 5px;
Expand Down
7 changes: 4 additions & 3 deletions ...ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import {Component, Input} from '@angular/core';
import {Component, Input, ViewEncapsulation} from '@angular/core';
import {Router} from '@angular/router';
import {TopologyOverview} from "@app/core";

@Component({
selector: 'w4c-topology-overview',
templateUrl: './topology-overview.component.html',
styleUrls: ['./topology-overview.component.scss']
styleUrls: ['./topology-overview.component.scss'],
encapsulation: ViewEncapsulation.None
})
export class TopologyOverviewComponent {

Expand All @@ -15,7 +16,7 @@ export class TopologyOverviewComponent {
private router: Router) {
}

modulesDisplayedColumns = ['icon', 'nodeName', 'typeName', 'version', 'metaproperties'];
modulesDisplayedColumns = ['icon', 'nodeName', 'typeName', 'metaproperties'];

/**
* Inidicates if the graph view should be displayed.
Expand Down
6 changes: 6 additions & 0 deletions alien4cloud-wizard-ui/src/main/webapp/assets/styles/_w4c-static.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,9 @@ $text-primary: #428bca;
fill: white;
stroke: white;
}

.mat-tab-label {
min-width: 15px !important;
max-height: 24px !important;
font-size: 12px !important;
}