Merge remote-tracking branch 'origin/develop' into dynamic-piwik
This commit is contained in:
commit
b6ead8d7e2
|
@ -23,6 +23,7 @@ export class Layout {
|
|||
variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color);
|
||||
variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none');
|
||||
variables['@hero-background-position'] = options.backgrounds.form.position;
|
||||
variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode?'dark':'light';
|
||||
}
|
||||
if (options.buttons) {
|
||||
//general
|
||||
|
@ -106,6 +107,7 @@ export class CustomizationOptions {
|
|||
imageUrl: string;
|
||||
imageFile: string;
|
||||
position: string;
|
||||
fontsDarkMode:boolean;
|
||||
}
|
||||
};
|
||||
buttons: {
|
||||
|
@ -132,7 +134,8 @@ export class CustomizationOptions {
|
|||
color: CustomizationOptions.getRGBA(this.identity.mainColor, 0.15),
|
||||
imageUrl: null,
|
||||
imageFile: null,
|
||||
position: null
|
||||
position: null,
|
||||
fontsDarkMode: true
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -194,6 +197,9 @@ export class CustomizationOptions {
|
|||
if (!current.backgrounds.form.position) {
|
||||
current.backgrounds.form.position = "center bottom"
|
||||
}
|
||||
if (!current.backgrounds.form.fontsDarkMode) {
|
||||
current.backgrounds.form.fontsDarkMode = true;
|
||||
}
|
||||
if (!current.buttons) {
|
||||
current.buttons = Object.assign({}, updated.buttons);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue