Merge branch 'main' into add-nested-dropdown-component

pxpm · pxpm · commit 48b48ba796f1 · 2023-08-24T11:50:52.000+01:00
diff --git a/src/resources/assets/css/common.css b/src/resources/assets/css/common.css
@@ -299,6 +299,7 @@ form .select2.select2-container {
 }
 
 .dt-buttons,
+.dtr-modal .details-control,
 .modal .details-control {
     display: none;
 }
diff --git a/src/resources/views/ui/errors/layout.blade.php b/src/resources/views/ui/errors/layout.blade.php
@@ -5,7 +5,7 @@
 <div class="row">
   <div class="col-md-12 text-center">
     <div class="error_number">
-      <small>{{ strtoupper(trans('backpack::base.error')) }}</small><br>
+      <small>{{ strtoupper(trans('backpack::base.error.title', ['error' => $error_number])) }}</small><br>
       {{ $error_number }}
       <hr>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ form .select2.select2-container {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`.dt-buttons,`
	`302`	`+.dtr-modal .details-control,`
`302`	`303`	`.modal .details-control {`
`303`	`304`	`display: none;`
`304`	`305`	`}`