From 25c16f4f28115f60e05a96b65fc841312471526c Mon Sep 17 00:00:00 2001
From: Katharina Bogad <katharina@bogad.at>
Date: Sat, 26 Jun 2021 00:14:16 +0200
Subject: [PATCH] Fix barcodescanner button css

---
 js/components/barcodescanner.js | 4 ++--
 js/helpers/frontend.js          | 3 ++-
 scss/_barcodes.scss             | 4 ++--
 scss/grocy.scss                 | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/components/barcodescanner.js b/js/components/barcodescanner.js
index b5466142..e3b86ed8 100644
--- a/js/components/barcodescanner.js
+++ b/js/components/barcodescanner.js
@@ -144,11 +144,11 @@ class barcodescanner
 			{
 				if ($(this).hasAttr("disabled"))
 				{
-					$(this).after('<a id="barcodescanner-start-button" class="btn btn-sm btn-primary text-white disabled" data-target="' + $(this).attr("data-target") + '"><i class="fas fa-camera"></i></a>');
+					$(this).after('<a id="barcodescanner-start-button" class="btn btn-sm btn-primary text-white disabled barcodescanner-start-button" data-target="' + $(this).attr("data-target") + '"><i class="fas fa-camera"></i></a>');
 				}
 				else
 				{
-					$(this).after('<a id="barcodescanner-start-button" class="btn btn-sm btn-primary text-white" data-target="' + $(this).attr("data-target") + '"><i class="fas fa-camera"></i></a>');
+					$(this).after('<a id="barcodescanner-start-button" class="btn btn-sm btn-primary text-white barcodescanner-start-button" data-target="' + $(this).attr("data-target") + '"><i class="fas fa-camera"></i></a>');
 				}
 			});
 		}, 50);
diff --git a/js/helpers/frontend.js b/js/helpers/frontend.js
index 94f9d76a..9ebdbdb1 100644
--- a/js/helpers/frontend.js
+++ b/js/helpers/frontend.js
@@ -209,11 +209,12 @@ class GrocyFrontendHelpers
 
 	ShowGenericError(message, exception)
 	{
+		var self = this;
 		toastr.error(this.Grocy.translate(message) + '<br><br>' + this.Grocy.translate('Click to show technical details'), '', {
 			onclick: function()
 			{
 				bootbox.alert({
-					title: this.Grocy.translate('Error details'),
+					title: self.Grocy.translate('Error details'),
 					message: '<pre class="my-0"><code>' + JSON.stringify(exception, null, 4) + '</code></pre>',
 					closeButton: false
 				});
diff --git a/scss/_barcodes.scss b/scss/_barcodes.scss
index 26fc2ace..baa3668a 100644
--- a/scss/_barcodes.scss
+++ b/scss/_barcodes.scss
@@ -13,7 +13,7 @@
 	width: 100%;
 }
 
-#barcodescanner-start-button {
+.barcodescanner-start-button {
 	position: absolute;
 	right: 0;
 	margin-top: 4px;
@@ -21,6 +21,6 @@
 	cursor: pointer;
 }
 
-.combobox-container #barcodescanner-start-button {
+.combobox-container .barcodescanner-start-button {
 	margin-right: 36px !important;
 }
\ No newline at end of file
diff --git a/scss/grocy.scss b/scss/grocy.scss
index 78fe9253..585471fd 100755
--- a/scss/grocy.scss
+++ b/scss/grocy.scss
@@ -8,6 +8,7 @@
 
 // main grocy-style
 @import "main";
+@import "barcodes";
 
 // third-party components