summaryrefslogtreecommitdiffstats
path: root/openecomp-ui
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-ui')
-rw-r--r--openecomp-ui/resources/scss/modules/_licenseModelLimits.scss38
-rw-r--r--openecomp-ui/src/nfvo-components/modal/GlobalModal.js5
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js4
3 files changed, 31 insertions, 16 deletions
diff --git a/openecomp-ui/resources/scss/modules/_licenseModelLimits.scss b/openecomp-ui/resources/scss/modules/_licenseModelLimits.scss
index 32fd128f2e..16b6af7cf9 100644
--- a/openecomp-ui/resources/scss/modules/_licenseModelLimits.scss
+++ b/openecomp-ui/resources/scss/modules/_licenseModelLimits.scss
@@ -38,23 +38,30 @@
.list-editor-item-view-content {
padding-left: 0;
}
- .svg-icon-wrapper.trashO {
- margin-bottom: 0;
+
+ .svg-icon {
+ margin-top: 10px;
margin-right: 50px;
- .svg-icon {
- fill: $gray;
- height: 16px;
- width: 16px;
- &:hover {
- fill: $dark-gray;
- }
- }
+ fill: $gray;
+ &:hover {
+ fill: $dark-gray;
+ }
}
+
&.selectable {
&:hover {
+ .list-editor-item-view-field {
+ .text.description, .text-name {
+ &:after {
+ background-color: darken($tlv-light-gray, 4%);
+ }
+ }
+
+ }
background-color: darken($tlv-light-gray, 4%);
cursor: pointer;
}
+
}
&:hover {
border-color: transparent;
@@ -65,20 +72,20 @@
display: flex;
align-items: center;
white-space: nowrap;
-
+
&.limit-name {
.text.name {
@extend .body-1-semibold;
color: $blue;
text-transform: uppercase;
- padding: 0px 10px;
+ margin-left : 45px;
}
border-right: 1px solid $light-gray;
margin-right: 22px;
flex: 0.4;
display: flex;
- justify-content: center;
+ justify-content: left;
}
&.limit-description {
@@ -90,10 +97,15 @@
max-width: 300px;
}
+
.text.description, .text.name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+ &:after {
+ background: $tlv-light-gray;
+ }
+
}
}
diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index e05c2ac616..f282046125 100644
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -112,7 +112,10 @@ export class GlobalModalView extends React.Component {
<Modal.Title>{title}</Modal.Title>
</Modal.Header>
<Modal.Body>
- {ComponentToRender ? <ComponentToRender {...modalComponentProps}/> : msg}
+ {ComponentToRender ?
+ <ComponentToRender {...modalComponentProps}/> :
+ <div> {msg && msg.split('\n').map(txt => <span> {txt} <br/> </span>)} </div>
+ }
</Modal.Body>
{(onConfirmed || onDeclined || type !== typeEnum.DEFAULT) &&
<ModalFooter
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
index 41306a1c1a..db7afd27d9 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
@@ -114,7 +114,7 @@ function objToString(obj) {
}
}
}
- return str;
+ return str.replace(/\n$/, '');
}
function parseUploadErrorMsg(error) {
@@ -124,7 +124,7 @@ function parseUploadErrorMsg(error) {
message += objToString(error[key]) + '\n';
}
}
- return message;
+ return message.replace(/\n$/, '');
}
function fetchSoftwareProductCategories(dispatch) {