Fix merge conflict

Issue-ID: CCSDK-2477

Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Change-Id: I86cdfdf56ae7e7dce00b17184117c94263cda250

3 files changed, 79 insertions, 46 deletions

diff --git a/cds-ui/designer-client/package.json b/cds-ui/designer-client/package.json
index 59cc5b550..5b08d6fce 100644
--- a/cds-ui/designer-client/package.json
+++ b/cds-ui/designer-client/package.json
@@ -77,4 +77,4 @@
     "tslint": "~5.15.0",
     "typescript": "~3.5.3"
   }
-}
\ No newline at end of file
+}
diff --git a/cds-ui/designer-client/src/assets/img/icon-info-color.svg b/cds-ui/designer-client/src/assets/img/icon-info-color.svg
new file mode 100644
index 000000000..6be69b67f
--- /dev/null
+++ b/cds-ui/designer-client/src/assets/img/icon-info-color.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>icon-info-color</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-info-color" fill="#1273EB" fill-rule="nonzero">
+            <path d="M7.3825,0 C3.305625,0 0,3.305625 0,7.3825 C0,11.459375 3.305625,14.765625 7.3825,14.765625 C11.459375,14.765625 14.765625,11.459375 14.765625,7.3825 C14.765625,3.305625 11.459375,0 7.3825,0 Z M8.919375,11.441875 C8.539375,11.591875 8.236875,11.705625 8.01,11.784375 C7.78375,11.863125 7.520625,11.9025 7.22125,11.9025 C6.76125,11.9025 6.403125,11.79 6.148125,11.565625 C5.893125,11.34125 5.76625,11.056875 5.76625,10.71125 C5.76625,10.576875 5.775625,10.439375 5.794375,10.299375 C5.81375,10.159375 5.844375,10.001875 5.88625,9.825 L6.361875,8.145 C6.40375,7.98375 6.44,7.830625 6.46875,7.688125 C6.4975,7.544375 6.51125,7.4125 6.51125,7.2925 C6.51125,7.07875 6.466875,6.92875 6.37875,6.844375 C6.289375,6.76 6.12125,6.71875 5.870625,6.71875 C5.748125,6.71875 5.621875,6.736875 5.4925,6.775 C5.364375,6.814375 5.253125,6.85 5.161875,6.885 L5.2875,6.3675 C5.59875,6.240625 5.896875,6.131875 6.18125,6.041875 C6.465625,5.950625 6.734375,5.905625 6.9875,5.905625 C7.444375,5.905625 7.796875,6.016875 8.045,6.236875 C8.291875,6.4575 8.41625,6.744375 8.41625,7.096875 C8.41625,7.17 8.4075,7.29875 8.390625,7.4825 C8.37375,7.666875 8.341875,7.835 8.295625,7.989375 L7.8225,9.664375 C7.78375,9.79875 7.749375,9.9525 7.718125,10.124375 C7.6875,10.29625 7.6725,10.4275 7.6725,10.515625 C7.6725,10.738125 7.721875,10.89 7.821875,10.970625 C7.920625,11.05125 8.09375,11.091875 8.33875,11.091875 C8.454375,11.091875 8.58375,11.07125 8.73,11.03125 C8.875,10.99125 8.98,10.955625 9.04625,10.925 L8.919375,11.441875 Z M8.835625,4.643125 C8.615,4.848125 8.349375,4.950625 8.03875,4.950625 C7.72875,4.950625 7.46125,4.848125 7.23875,4.643125 C7.0175,4.438125 6.905625,4.18875 6.905625,3.8975 C6.905625,3.606875 7.018125,3.356875 7.23875,3.15 C7.46125,2.9425 7.72875,2.839375 8.03875,2.839375 C8.349375,2.839375 8.615625,2.9425 8.835625,3.15 C9.05625,3.356875 9.166875,3.606875 9.166875,3.8975 C9.166875,4.189375 9.05625,4.438125 8.835625,4.643125 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/cds-ui/designer-client/src/styles.css b/cds-ui/designer-client/src/styles.css
index df5d51507..a3c4b2b10 100644
--- a/cds-ui/designer-client/src/styles.css
+++ b/cds-ui/designer-client/src/styles.css
@@ -76,6 +76,10 @@ body{
   background: url(/assets/img/icon-error.svg) 12px center #fff no-repeat !important;
   background-size: 18px !important;
 }
+.toast-info{
+  border-left: solid 5px #1273EB !important;
+  background: url(/assets/img/icon-info-color.svg) 12px center #fff no-repeat !important;
+}
 /*ICONS*/
 .icon-menuDots{
   font-size: 3px !important;
@@ -422,6 +426,10 @@ height: 40px;
   text-decoration: none;
   color: #1B3E6F;
 }
+.tags-filter-list{
+  max-height: 260px;
+  overflow-y: auto; 
+}
 /**Packages Sort**/
 .sort-packages{
   font-size: 12px;
@@ -544,7 +552,7 @@ height: 40px;
 .packages-card [data-tooltip]:after {
   padding: 9px;
   font-size: 11px;
-  background: #F4F9FE;
+  background: #fff;
   border: solid 1px #E6EDF5;
   box-shadow: 0 0 12 rgba(0,0,0,0.8);
   border-radius: 3px;
@@ -672,6 +680,10 @@ height: 40px;
   padding: 15px 20px 15px 44px !important;
   background: url(/assets/img/icon-required-yes.svg) 20px center no-repeat !important;
 }
+.tabs-no-content{
+  font-size: 13px;
+  font-weight: bold;
+}
 /**Sliding Search Input**/
 .searchBox{
   position: absolute;
@@ -1021,8 +1033,9 @@ height: 40px;
 .fillteredTags{
   margin-left: 3px;
   padding: 3px 3px;
-  background: #1B3E6F;
-  color: #fff;
+  background: #C3CDDB;
+  color: #1B3E6F;
+  font-weight: bold;
   border-radius: 4px;
 }
 /**Packages Sort**/
@@ -1759,8 +1772,8 @@ ul.package-contributers{
   z-index: 1000;
   padding: 8px;
   width: auto;
-  background-color: #DEE8F3;
-  background-color: rgba(222, 232, 243, 1.0);
+  background-color: #fff;
+  background-color: rgba(255, 255, 255, 1.0);
   color: #1B3E6F;
   content: attr(data-tooltip);
   font-size: 10px;
@@ -1786,7 +1799,6 @@ ul.package-contributers{
 .tooltip-top:before {
   margin-left: 0;
   margin-bottom: -12px;
-
   border-bottom-color: #DEE8F3;
   border-bottom-color: rgba(222, 232, 243, 1.0);
 }
@@ -1828,8 +1840,8 @@ ul.package-contributers{
   margin-right: -12px;
   margin-bottom: 0;
   border-top-color: transparent;
-  border-left-color: #000;
-  border-left-color: hsla(0, 0%, 20%, 0.9);
+  border-left-color: #fff;
+  /* border-left-color: hsla(0, 0%, 20%, 0.9); */
 }
 
 .tooltip-left:hover:before,
@@ -1877,8 +1889,8 @@ ul.package-contributers{
   margin-bottom: 0;
   margin-left: -12px;
   border-top-color: transparent;
-  border-right-color: #000;
-  border-right-color: hsla(0, 0%, 20%, 0.9);
+  border-right-color: #fff;
+  /* border-right-color: hsla(0, 0%, 20%, 0.9); */
 }
 
 .tooltip-right:hover:before,
@@ -1913,10 +1925,11 @@ ul.package-contributers{
   width: 100% !important;
   text-align: left!important;
   color:#1B3E6F;
-  background-color: #F4F9FE;
+  background-color: #fff;
   border: solid 1px #E6EDF5;
   border-radius: 3px !important;
   font-size: 11px;
+  opacity: 1.0 !important;
 }  
 .bs-tooltip-bottom .arrow::before{
   border-bottom-color:  #E6EDF5  !important;
@@ -1924,6 +1937,12 @@ ul.package-contributers{
 .bs-tooltip-top .arrow::before{
   border-top-color:  #E6EDF5  !important;
 }

+.bs-tooltip-left .arrow::before{
+  border-left-color:  #E6EDF5  !important;
+}
 
+.bs-tooltip-right .arrow::before{
+  border-right-color:  #E6EDF5  !important;
+}

 	
 
 
@@ -2155,32 +2174,34 @@ padding-left: 20px !important;
   font-size: 13px;
   color: #1B3E6F;
 }
-      .single-line select:focus{
-        box-shadow: 0 0 0 0;
-      }
-      .single-line select option:first-child{
-        color: #C3CDDB;
-      }
-    .single-line-model input::placeholder{
-      font-size: 14px;
-      color: #C3CDDB;
-      }
-      .single-line-model.error{
-        color:#FF6469;
-      }
-      .single-line-model.error input{
-        color:#FF6469;
-        border-bottom: 1px solid #FF6469 !important;
-      }
-  .single-line .custom-key{
-    background: none;
-    border: 0px;
-    color:#1273EB ;
-    font-size: 15px;
-  }
-  .single-line .custom-key:focus{
-    outline: none;
-  }
+.single-line select:focus{
+  box-shadow: 0 0 0 0;
+}
+.single-line select option:first-child{
+  color: #C3CDDB;
+}
+.single-line-model input::placeholder{
+  font-size: 14px;
+  color: #C3CDDB;
+}
+.single-line-model.error{
+  color:#FF6469;
+}
+.single-line-model.error input,
+.label-input input.ng-invalid{
+  box-shadow: none;
+  color:#FF6469;
+  border-bottom: 1px solid #FF6469 !important;
+}
+.single-line .custom-key{
+  background: none;
+  border: 0px;
+  color:#1273EB ;
+  font-size: 15px;
+}
+.single-line .custom-key:focus{
+  outline: none;
+}
 .creat-container{
   padding:70px 100px 70px 70px;
   position: relative;
@@ -2252,6 +2273,7 @@ hr{
 }
 .action-button:hover{
   text-decoration: none;
+  cursor: pointer;
 }
 .action-button i{
   background: #fff;
@@ -2286,8 +2308,9 @@ hr{
 .action-button.delete i{
   color: #BABBC3;
 }
-.action-button.delete:hover{
-  color: #FF6469;
+.action-button.delete:hover,
+.action-button.delete:hover .icon-delete-sm{
+  color: #FF6469 !important;
 }
 .mode-icon{
   font-size: 20px;
@@ -2652,17 +2675,16 @@ hr{
   position: absolute;
   top: 13px;
 }
-.ace-tomorrow-night-bright .ace_print-margin{
+.ace_scroller{
+  overflow: auto !important;
+}
+.ace_print-margin{
   left: 100% !important;
   background: #eee !important;
 }
 .ace_content{
   width: 100%;
 }
-.ace_line,
-.ace-eclipse .ace_print-margin{
-  /* background: #fff; */
-}
 .ace_editor{
   height: 55vh !important;
   line-height: 25px;
@@ -2886,7 +2908,7 @@ margin-right: 5px;
   margin-left: 5px;
 }
 .deply-status-icon{
-  margin-left: 6px;
+  margin-right: 4px;
   width: 1.6%;
   vertical-align: baseline;
 }