From dd60339b06d252fcb1382aa97ab3d65b37dad021 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Wed, 12 Jul 2017 00:54:52 +0300 Subject: [sdc] rebase update Change-Id: I8f1fc7150975122dd9f3f4e653b9983064b399a6 Signed-off-by: Michael Lando --- .../deployment-artifacts-view-model.ts | 20 ++++++++++++++++++++ .../deployment-artifacts-view.html | 4 ++-- .../deployment-artifacts/deployment-artifacts.less | 9 +++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) (limited to 'catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts') diff --git a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts index 2816c312f9..6990ad7241 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts +++ b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model.ts @@ -1,3 +1,23 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + //@require "./*.html" 'use strict'; import {IWorkspaceViewModelScope} from "app/view-models/workspace/workspace-view-model"; diff --git a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view.html b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view.html index a36eb1b74d..bcfcccf1f6 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view.html +++ b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view.html @@ -34,10 +34,10 @@ uib-popover-template="popoverTemplate" popover-class="parameter-description-popover deployment-artifact-view top" popover-title="Description" - popover-placement="top-left" + popover-placement="auto top-left" popover-is-open="selectedArtifactId == artifact.uniqueId && !isLoading" popover-trigger="'none'" - popover-append-to-body="true" + popover-append-to-body="false" data-ng-click="openDescriptionPopover(artifact.uniqueId)" data-tests-id="descriptionIcon_{{artifact.artifactDisplayName}}"> diff --git a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less index dd3b16447c..3596a217b8 100644 --- a/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less +++ b/catalog-ui/src/app/view-models/workspace/tabs/deployment-artifacts/deployment-artifacts.less @@ -160,7 +160,7 @@ } .i-sdc-env-form-label{ - font-family: @font-omnes-medium; + font-family: @font-opensans-medium; color: @main_color_m; overflow: hidden; max-width: 450px; @@ -178,8 +178,13 @@ } } +.table-container-flex .table .body .scrollbar-container { + overflow-x:auto !important; //need to override the overflow-hidden for the table so that the popover auto positioning works + min-height: 400px; +} + .parameter-description-popover.deployment-artifact-view { - margin-left: -10px; + margin-left: -22px; z-index: 1040; min-width: 300px; .input-error { -- cgit 1.2.3-korg