diff --git a/print_designer/print_designer/page/print_designer/jinja/macros/styles.html b/print_designer/print_designer/page/print_designer/jinja/macros/styles.html index f359778f..5faddb00 100644 --- a/print_designer/print_designer/page/print_designer/jinja/macros/styles.html +++ b/print_designer/print_designer/page/print_designer/jinja/macros/styles.html @@ -1,16 +1,28 @@ {% macro render_styles(settings) %} -{% endmacro %} \ No newline at end of file +{% endmacro %} diff --git a/print_designer/print_designer/page/print_designer/jinja/print_format.html b/print_designer/print_designer/page/print_designer/jinja/print_format.html index 988cb7ea..8227c727 100644 --- a/print_designer/print_designer/page/print_designer/jinja/print_format.html +++ b/print_designer/print_designer/page/print_designer/jinja/print_format.html @@ -33,5 +33,6 @@ +
-{{ render_styles(settings) }} \ No newline at end of file +{{ render_styles(settings) }} diff --git a/print_designer/public/js/print_designer/PropertiesPanelState.js b/print_designer/public/js/print_designer/PropertiesPanelState.js index c9e9b3d7..d82c2b5d 100644 --- a/print_designer/public/js/print_designer/PropertiesPanelState.js +++ b/print_designer/public/js/print_designer/PropertiesPanelState.js @@ -389,6 +389,23 @@ export const createPropertiesPanel = () => { }); }, }, + { + label: "Background", + name: "pageBackground", + isLabelled: true, + condtional: null, + frappeControl: (ref, name) => { + const { page } = storeToRefs(MainStore); + makeFeild({ + name, + ref, + fieldtype: "Color", + requiredData: () => page.backgroundColor, + reactiveObject: page, + propertyName: "backgroundColor", + }); + }, + }, [ pageInput("Height", "page_height", "height", { parentBorderTop: true, diff --git a/print_designer/public/js/print_designer/defaultObjects.js b/print_designer/public/js/print_designer/defaultObjects.js index ef6ad21d..9bee19d9 100644 --- a/print_designer/public/js/print_designer/defaultObjects.js +++ b/print_designer/public/js/print_designer/defaultObjects.js @@ -267,6 +267,7 @@ export const GoogleFonts = { [400, 500, 600, 700], ], BioRhyme: [[200, 300, 400, 700, 800], []], + Belleza: [[400], []], Cardo: [[400, 700], [400]], Chivo: [ [100, 200, 300, 400, 500, 600, 700, 800, 900], @@ -328,6 +329,10 @@ export const GoogleFonts = { [100, 200, 300, 400, 500, 600, 700, 800, 900], [100, 200, 300, 400, 500, 600, 700, 800, 900], ], + Mukta: [ + [200, 300, 400, 500, 600, 700, 800], + [200, 300, 400, 500, 600, 700, 800], + ], Neuton: [[200, 300, 400, 700, 800], [400]], Nunito: [ [200, 300, 400, 500, 600, 700, 800, 900], diff --git a/print_designer/public/js/print_designer/store/MainStore.js b/print_designer/public/js/print_designer/store/MainStore.js index 2cd78d45..a8066019 100644 --- a/print_designer/public/js/print_designer/store/MainStore.js +++ b/print_designer/public/js/print_designer/store/MainStore.js @@ -91,6 +91,7 @@ export const useMainStore = defineStore("MainStore", { headerHeightWithMargin: 0, footerHeightWithMargin: 0, UOM: "mm", + backgroundColor: "#ffffff", }, controls: { MousePointer: { @@ -185,6 +186,7 @@ export const useMainStore = defineStore("MainStore", { }, getPageSettings() { return { + backgroundColor: this.page.backgroundColor, height: this.convertToPageUOM( this.page.height - (this.page.marginTop + this.page.marginBottom)