From 358c3ce17e45b63f9ed936119dd86f7f0211197a Mon Sep 17 00:00:00 2001 From: Eusebe Kanani Date: Thu, 5 Sep 2019 16:31:53 +0200 Subject: [PATCH 1/4] [some-debugs] div scroll fix on topology-oveview and module view apaptation on Application Dashboartd --- .../catalog-list/catalog-list.component.html | 4 ++-- .../topology-overview.component.html | 20 +++++++++---------- .../topology-overview.component.scss | 2 +- .../topology-overview.component.ts | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.html b/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.html index b89ac04..464aadf 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.html +++ b/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.html @@ -20,10 +20,10 @@ -
+
{{catalog.description}}
-
+
format_align_justify
-
+
{{ overview.description }}
@@ -40,15 +40,15 @@ Type - - {{element.nodeType.elementId|w4cToscaTypeShortName}} - - - - Version - - {{element.nodeType.archiveVersion}} + +
+
+ {{element.nodeType.elementId|w4cToscaTypeShortName}} +
+
+ {{element.nodeType.archiveVersion}} +
+
diff --git a/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.scss b/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.scss index 8d632d6..5de17db 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.scss +++ b/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.scss @@ -1,5 +1,5 @@ .desciption { - height: 300px; + height: 320px; overflow-y: scroll; padding: 5px; margin: 5px; diff --git a/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts b/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts index 14ae4ae..1fbb298 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts +++ b/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts @@ -15,7 +15,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. From 7f619988c4e960be57c4b716041c2470d3cc427c Mon Sep 17 00:00:00 2001 From: Eusebe Kanani Date: Thu, 5 Sep 2019 16:49:59 +0200 Subject: [PATCH 2/4] [some-debugs] Tabs label customize , test ViewEncapsulation --- .../topology-overview/topology-overview.component.ts | 5 +++-- .../src/main/webapp/assets/styles/_w4c-static.scss | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts b/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts index 1fbb298..9d06629 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts +++ b/alien4cloud-wizard-ui/src/main/webapp/app/shared/components/topology-overview/topology-overview.component.ts @@ -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 { diff --git a/alien4cloud-wizard-ui/src/main/webapp/assets/styles/_w4c-static.scss b/alien4cloud-wizard-ui/src/main/webapp/assets/styles/_w4c-static.scss index e0c7249..42dfbd6 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/assets/styles/_w4c-static.scss +++ b/alien4cloud-wizard-ui/src/main/webapp/assets/styles/_w4c-static.scss @@ -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; +} From c774b6e1d9edbd683cb96e9610d24f6c291ae285 Mon Sep 17 00:00:00 2001 From: Eusebe Kanani Date: Thu, 5 Sep 2019 16:57:34 +0200 Subject: [PATCH 3/4] [some-debugs] hide scroll bar on catalog list items (windows pc) --- .../catalog/catalog-list/catalog-list.component.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss b/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss index d933209..5580f3e 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss +++ b/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss @@ -33,6 +33,12 @@ From old alien } +.description::-webkit-scrollbar { + background: hidden ; +} + + + From b6fc0f0940f10a42d55402fc4ccd8a6f7dc2259a Mon Sep 17 00:00:00 2001 From: Eusebe Kanani Date: Thu, 5 Sep 2019 17:17:34 +0200 Subject: [PATCH 4/4] [some-debugs] div scroll fix on topology-oveview and module view apaptation on Application Dashboartd : Fix scss --- .../catalog/catalog-list/catalog-list.component.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss b/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss index 5580f3e..f113f4c 100644 --- a/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss +++ b/alien4cloud-wizard-ui/src/main/webapp/app/features/catalog/catalog-list/catalog-list.component.scss @@ -34,9 +34,12 @@ From old alien .description::-webkit-scrollbar { - background: hidden ; + background: transparent ; } +.metaproperties::-webkit-scrollbar{ + background: transparent ; +}