github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-09 05:56:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix barcodescanner button css

Browse Source
This commit is contained in:
Katharina Bogad 2021-06-26 00:14:16 +02:00
parent e02779bed4
commit 25c16f4f28
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/barcodescanner.js
View File

@ -144,11 +144,11 @@ class barcodescanner
{ {
if ($(this).hasAttr("disabled")) 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 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); }, 50);

3
js/helpers/frontend.js
View File

@ -209,11 +209,12 @@ class GrocyFrontendHelpers
ShowGenericError(message, exception) ShowGenericError(message, exception)
{ {
var self = this;
toastr.error(this.Grocy.translate(message) + '<br><br>' + this.Grocy.translate('Click to show technical details'), '', { toastr.error(this.Grocy.translate(message) + '<br><br>' + this.Grocy.translate('Click to show technical details'), '', {
onclick: function() onclick: function()
{ {
bootbox.alert({ 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>', message: '<pre class="my-0"><code>' + JSON.stringify(exception, null, 4) + '</code></pre>',
closeButton: false closeButton: false
}); });

4
scss/_barcodes.scss
View File

@ -13,7 +13,7 @@
width: 100%; width: 100%;
} }
#barcodescanner-start-button { .barcodescanner-start-button {
position: absolute; position: absolute;
right: 0; right: 0;
margin-top: 4px; margin-top: 4px;
@ -21,6 +21,6 @@
cursor: pointer; cursor: pointer;
} }
.combobox-container #barcodescanner-start-button { .combobox-container .barcodescanner-start-button {
margin-right: 36px !important; margin-right: 36px !important;
} }

1
scss/grocy.scss
View File

@ -8,6 +8,7 @@
// main grocy-style // main grocy-style
@import "main"; @import "main";
@import "barcodes";
// third-party components // third-party components