diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js index c2314d6664..8ac812c0ed 100644 --- a/frappe/public/js/frappe/form/controls/barcode.js +++ b/frappe/public/js/frappe/form/controls/barcode.js @@ -8,7 +8,7 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({ this.default_svg = ''; let $input_wrapper = this.$wrapper.find('.control-input-wrapper'); this.barcode_area = $( - `
` + `` ); this.barcode_area.appendTo($input_wrapper); }, @@ -55,7 +55,14 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({ get_options(value) { // get JsBarcode options - let options = JSON.parse('{ "height" : 40 }'); + let options = {}; + options.background = "var(--control-bg)"; + options.lineColor = "var(--text-color)"; + options.font = "var(--font-stack)"; + options.fontSize = "16"; + options.width = "3"; + options.height = "50"; + if (frappe.utils.is_json(this.df.options)) { options = JSON.parse(this.df.options); if (options.format && options.format === 'EAN') { diff --git a/frappe/public/scss/desk/controls.scss b/frappe/public/scss/desk/controls.scss index 489bb44ea5..6e65220c40 100644 --- a/frappe/public/scss/desk/controls.scss +++ b/frappe/public/scss/desk/controls.scss @@ -199,6 +199,9 @@ textarea.form-control { .barcode-wrapper { text-align: center; + background-color: var(--control-bg); + border-radius: var(--border-radius); + padding: var(--padding-md); } @media (min-width: 768px) {