[Connect|Trunk]

Customization:
 - updates on customization object
 - clean up css


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@60829 d315682c-612b-4755-9ff5-7f18f6832af3

src/app/utils/customization/customization.component.ts

@@ -31,7 +31,7 @@ export class CustomizationComponent {
       layout => {
         if (layout) {
           console.debug("service");
-          this.layout = layout.layoutOptions;
+          this.layout = CustomizationOptions.checkForObsoleteVersion(layout.layoutOptions,this.communityId);
         } else {
           this.layout = new CustomizationOptions(CustomizationOptions.getIdentity(this.communityId).mainColor, CustomizationOptions.getIdentity(this.communityId).secondaryColor);
           console.debug("default");
@@ -99,6 +99,11 @@ export class CustomizationComponent {
       --background-light-color: ` + this.layout.backgrounds.light.color+`;
     }
     `;
+    //Search SVG
+    let search = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 532"><defs><style>.cls-1{isolation:isolate;}.cls-2{fill:{{color}};mix-blend-mode:multiply;}</style></defs><title>Asset 3</title><g class="cls-1"><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-2" d="M0,431s362,109,841,62,632,68,1159-9V0H0Z"/><path class="cls-2" d="M0,514s1401,71,2000-69V0H0Z"/></g></g></g></svg>`;;
+    let svg = 'data:image/svg+xml,' + encodeURIComponent(search.replace('{{color}}', this.layout.backgrounds.form.color));
+    this.customizationCss = this.customizationCss.concat('.generalSearchForm,.publicationsSearchForm,.projectsSearchForm, .projectsTableSearchForm,.organizationsSearchForm,.datasourcesSearchForm {');
+    this.customizationCss = this.customizationCss.concat(' background:  ' + "url('" + svg + "') transparent no-repeat center bottom }");
 
     this.customizationCss = this.customizationCss.concat('  .communityPanelBackground, .communityPanelBackground .uk-section-primary {');
     this.customizationCss = this.customizationCss.concat(' background-color:  ' + this.layout.backgrounds.dark.color + ';}');

src/assets/connect-custom.css

@@ -48,22 +48,6 @@
   background: transparent linear-gradient(0deg, #FAFAFA 0%, #E2EEFA 100%);
 }
 
-.generalSearchForm,
-.publicationsSearchForm,
-.projectsSearchForm, .projectsTableSearchForm,
-.organizationsSearchForm,
-.datasetsSearchForm,
-.softwareSearchForm,
-.orpsSearchForm,
-.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,
-.journalsSearchForm, .journalsTableSearchForm,
-.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {
-    background: url('search-background.svg')   transparent no-repeat center bottom   ;
-    background-size: cover !important;
-    height: inherit;
-
-}
-
 .communityToolBar {
   background-color: #dedede;
   z-index: 10;

src/assets/customization.css

@@ -127,16 +127,16 @@ a:not(.uk-button),
 #stickyNavbar{
     box-shadow: 0 1px 1px #0000004D;
 }
-.uk-button-primary{
+.uk-button-primary, .uk-button-secondary, .uk-button-default{
     color: white !important;
     background-color: var(--portal-main-color) !important;
     border-color: var(--portal-main-color) !important;
 }
-.uk-button-primary:hover{
+.uk-button-primary:hover, .uk-button-secondary:hover, .uk-button-default:hover{
     background-color: var(--portal-dark-color) !important;
     border-color: var(--portal-dark-color) !important;
 }
-.uk-button-secondary, .uk-button-default{
+/*.uk-button-secondary, .uk-button-default{
     color: var(--portal-main-color) !important;
     background-color: white !important;
     border-color: var(--portal-main-color) !important;
@@ -145,7 +145,7 @@ a:not(.uk-button),
     color: white !important;
     background-color: var(--portal-main-color) !important;
     border-color: var(--portal-main-color) !important;
-}
+}*/
 .uk-alert-primary{
     color:  var(--portal-main-color);
     border-color: var(--portal-main-color);
@@ -154,3 +154,12 @@ a:not(.uk-button),
 .uk-text-primary, .landing .download-from a:hover{
     color:  var(--portal-main-color) !important;
 }
+
+.generalSearchForm,
+.publicationsSearchForm,
+.projectsSearchForm,
+.organizationsSearchForm,
+.datasourcesSearchForm{
+    background-size: cover !important;
+    height: inherit;
+}