Make CSS preloadable, move some CSS out of header

js/grocy.js

@@ -252,7 +252,7 @@ class GrocyClass
 		}
 	}
 
-	PreloadView(viewName, cb = () => { })
+	PreloadView(viewName, loadCSS = false, cb = () => { })
 	{
 		if (!Object.prototype.hasOwnProperty.call(window, viewName + "View"))
 		{
@@ -262,6 +262,14 @@ class GrocyClass
 				url: this.FormatUrl('/viewjs/' + viewName + '.js'),
 				success: cb
 			});
+			if (loadCSS)
+			{
+				$("<link/>", {
+					rel: "stylesheet",
+					type: "text/css",
+					href: this.FormatUrl('/css/viewcss/' + viewName + '.cs')
+				}).appendTo("head");
+			}
 		}
 		else
 		{

scss/_barcodes.scss

@@ -12,3 +12,15 @@
 #barcodescanner-livestream canvas {
 	width: 100%;
 }
+
+#barcodescanner-start-button {
+	position: absolute;
+	right: 0;
+	margin-top: 4px;
+	margin-right: 5px;
+	cursor: pointer;
+}
+
+.combobox-container #barcodescanner-start-button {
+	margin-right: 36px !important;
+}

views/components/barcodescanner.blade.php

@@ -1,19 +0,0 @@
-@if (!GROCY_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING)
-
-@push('pageStyles')
-<style>
-	#barcodescanner-start-button {
-		position: absolute;
-		right: 0;
-		margin-top: 4px;
-		margin-right: 5px;
-		cursor: pointer;
-	}
-
-	.combobox-container #barcodescanner-start-button {
-		margin-right: 36px !important;
-	}
-</style>
-@endpush
-
-@endif

views/layout/json.blade.php

@@ -0,0 +1,5 @@
+@php
+// this is a shoe-horned method to generate a "proper" subview as JSON.
+
+
+@endphp

views/recipeform.blade.php

@@ -21,7 +21,7 @@
 	RecipePictureFileName: '{{ $recipe->picture_file_name }}',
 @endif
 
-@stop
+@endsection
 
 @section('content')
 <div class="row">