Merge branch 'development' into 328-make-split-points-work-with-begin…

…-and-end
NeoCoderMatrix86 · Apr 19, 2024 · 7525103 · 7525103
2 parents 01d6608 + fdc3e23
commit 7525103
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/AudioCuesheetEditor/Pages/ViewModeImport.razor b/AudioCuesheetEditor/Pages/ViewModeImport.razor
@@ -39,11 +39,11 @@ along with Foobar.  If not, see
                 <Card>
                     <CardHeader><CardTitle Size="2">@_localizer["Select files for import"]</CardTitle></CardHeader>
                     <CardBody>
-                        <div class="dragNDropFile mb-3" ondragover="dragOver(event, this)" ondragleave="dragLeave(event, this)" ondrop="dropFiles(event, this, 'dropFileInput')">
+                        <Field class="dragNDropFile mb-3" ondragover="dragOver(event, this)" ondragleave="dragLeave(event, this)" ondrop="dropFiles(event, this, 'dropFileInput')">
                             <svg class="dragNDropFileIcon" xmlns="http://www.w3.org/2000/svg" width="50" height="43" viewBox="0 0 50 43"><path d="M48.4 26.5c-.9 0-1.7.7-1.7 1.7v11.6h-43.3v-11.6c0-.9-.7-1.7-1.7-1.7s-1.7.7-1.7 1.7v13.2c0 .9.7 1.7 1.7 1.7h46.7c.9 0 1.7-.7 1.7-1.7v-13.2c0-1-.7-1.7-1.7-1.7zm-24.5 6.1c.3.3.8.5 1.2.5.4 0 .9-.2 1.2-.5l10-11.6c.7-.7.7-1.7 0-2.4s-1.7-.7-2.4 0l-7.1 8.3v-25.3c0-.9-.7-1.7-1.7-1.7s-1.7.7-1.7 1.7v25.3l-7.1-8.3c-.7-.7-1.7-.7-2.4 0s-.7 1.7 0 2.4l10 11.6z"></path></svg>
-                            <FileEdit id="dropFileInput" Class="hideInput" Multiple Filter="@dragNDropUploadFilter" Changed="OnDropFileChanged" AutoReset="false"></FileEdit>
-                            <label for="dropFileInput">@((MarkupString)(_localizer["Choose file or drag it here"].ToString()))</label>
-                        </div>
+                            <FileEdit id="dropFileInput" Multiple Filter="@dragNDropUploadFilter" Changed="OnDropFileChanged" AutoReset="false"></FileEdit>
+                            <FieldLabel for="dropFileInput">@((MarkupString)(_localizer["Choose file or drag it here"].ToString()))</FieldLabel>
+                        </Field>
                         @foreach (var invalidFileName in invalidDropFileNames)
                         {
                             <Alert @ref="alertInvalidFile" Color="Color.Danger" Visible Dismisable>

diff --git a/AudioCuesheetEditor/wwwroot/css/app.css b/AudioCuesheetEditor/wwwroot/css/app.css
@@ -80,7 +80,7 @@ a, .btn-link {
         cursor: move;
     }
 
-.hideInput {
+.dragNDropFile > .input-group {
     width: 0.1px;
     height: 0.1px;
     opacity: 0;
@@ -89,7 +89,7 @@ a, .btn-link {
     z-index: -1;
 }
 
-    .hideInput + label {
+.dragNDropFile > .form-label {
         max-width: 80%;
         text-overflow: ellipsis;
         white-space: nowrap;