From dd37e12864c50e21cd2150350e3a5a4bcd2ab54e Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 28 Jul 2022 16:50:32 +0300 Subject: [PATCH] Customization: more layout changes, apply fix to reset to default the background image --- .../pages/customization/background-upload.component.ts | 2 +- src/app/pages/customization/border.component.ts | 6 +++--- .../pages/customization/customization.component.html | 10 +++++----- src/app/pages/customization/customization.component.ts | 5 +++-- .../customization/quickLook-backgrounds.component.ts | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/pages/customization/background-upload.component.ts b/src/app/pages/customization/background-upload.component.ts index 228658d..996b407 100644 --- a/src/app/pages/customization/background-upload.component.ts +++ b/src/app/pages/customization/background-upload.component.ts @@ -28,7 +28,7 @@ declare var UIkit;
position
-
diff --git a/src/app/pages/customization/border.component.ts b/src/app/pages/customization/border.component.ts index 010b8b9..87ef2ab 100644 --- a/src/app/pages/customization/border.component.ts +++ b/src/app/pages/customization/border.component.ts @@ -13,7 +13,7 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core';
-
+
@@ -23,7 +23,7 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core'; (click)="width = widthPublished; borderChanged()">
-
+
@@ -32,7 +32,7 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core'; uk-tooltip="title:
Reset to previously saved options
" (click)="style = stylePublished;borderChanged()">
-
diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 93bc513..e74fc7d 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -149,7 +149,7 @@ -
+
Custom style @@ -184,7 +184,7 @@
-
+
Custom style @@ -241,7 +241,7 @@
-
+
Custom style @@ -258,9 +258,9 @@
-
+
style on
-
diff --git a/src/app/pages/customization/customization.component.ts b/src/app/pages/customization/customization.component.ts index 5626f3a..64566ee 100644 --- a/src/app/pages/customization/customization.component.ts +++ b/src/app/pages/customization/customization.component.ts @@ -259,6 +259,7 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" }, this.draftCustomizationOptions.backgrounds.dark.color = backgrounds.dark.color; this.draftCustomizationOptions.backgrounds.light.color = backgrounds.light.color; this.draftCustomizationOptions.backgrounds.form.color = backgrounds.form.color; + this.resetImageTo(backgrounds); } resetImageTo(backgrounds) { @@ -276,11 +277,11 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" }, this.resetBackgroundsAndButtonsTo(this.publishedCustomizationOptions); } resetButtonsToDefault(){ - this.resetButtonsTo(this.publishedCustomizationOptions.buttons); + this.resetButtonsTo(this.defaultCustomizationOptions.buttons); this.updateButtonsBasedOnIdentity(); } resetBackgroundsToDefault(){ - this.resetBackgroundsTo(this.publishedCustomizationOptions.backgrounds); + this.resetBackgroundsTo(this.defaultCustomizationOptions.backgrounds); this.updateBackgroundsBasedOnIdentity(); } resetButtonsTo(buttonsToRevert) { diff --git a/src/app/pages/customization/quickLook-backgrounds.component.ts b/src/app/pages/customization/quickLook-backgrounds.component.ts index 435e821..8d006aa 100644 --- a/src/app/pages/customization/quickLook-backgrounds.component.ts +++ b/src/app/pages/customization/quickLook-backgrounds.component.ts @@ -23,7 +23,7 @@ import {ButtonsCustomization} from '../../openaireLibrary/connect/community/Cust
Light background
-

Heading