Bootstrap5 needs explicit spacing between form rows

isnusun · Jan 23, 2022 · afc2d19 · afc2d19
1 parent a90d1d4
commit afc2d19
Show file tree

Hide file tree

Showing 108 changed files with 400 additions and 400 deletions.
diff --git a/resources/views/admin/analytics-edit.phtml b/resources/views/admin/analytics-edit.phtml
@@ -22,7 +22,7 @@ use Fisharebest\Webtrees\I18N;
     <?= csrf_field() ?>
     <?= $form_fields ?>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3" for="preview">
             <?= I18N::translate('Preview') ?>
         </label>
@@ -33,7 +33,7 @@ use Fisharebest\Webtrees\I18N;
     </div>
 
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="offset-sm-3 col-sm-9">
             <button type="submit" class="btn btn-primary">
                 <?= view('icons/save') ?>

diff --git a/resources/views/admin/broadcast.phtml b/resources/views/admin/broadcast.phtml
@@ -25,7 +25,7 @@ use Illuminate\Support\Collection;
 <form method="post" action="<?= e(route(BroadcastAction::class)) ?>">
     <?= csrf_field() ?>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="from">
             <?= I18N::translateContext('Email sender', 'From') ?>
         </label>
@@ -34,7 +34,7 @@ use Illuminate\Support\Collection;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="to">
             <?= I18N::translateContext('Email recipient', 'To') ?>
         </label>
@@ -44,7 +44,7 @@ use Illuminate\Support\Collection;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="subject">
             <?= I18N::translate('Subject') ?>
         </label>
@@ -53,7 +53,7 @@ use Illuminate\Support\Collection;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="body">
             <?= I18N::translate('Message') ?>
         </label>
@@ -62,7 +62,7 @@ use Illuminate\Support\Collection;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="col-sm-3 col-form-label"></div>
         <div class="col-sm-9">
             <button type="submit" class="btn btn-primary">

diff --git a/resources/views/admin/data-fix-page.phtml b/resources/views/admin/data-fix-page.phtml
@@ -32,7 +32,7 @@ use Fisharebest\Webtrees\View;
 
     <?= $data_fix->fixOptions($tree) ?>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="col-sm-3">
         </div>
 

diff --git a/resources/views/admin/data-fix-select.phtml b/resources/views/admin/data-fix-select.phtml
@@ -24,7 +24,7 @@ use Illuminate\Support\Collection;
 <form method="post" action="<?= e(route(DataFixSelect::class, ['tree' => $tree->name()])) ?>">
     <?= csrf_field() ?>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="data_fix">
             <?= I18N::translate('Data fix') ?>
         </label>
@@ -40,7 +40,7 @@ use Illuminate\Support\Collection;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="col-sm-3">
         </div>
 

diff --git a/resources/views/admin/email-page.phtml b/resources/views/admin/email-page.phtml
@@ -27,7 +27,7 @@ use Fisharebest\Webtrees\I18N;
 <form method="post" action="<?= e(route(EmailPreferencesAction::class, ['to' => $to->userName()])) ?>">
     <?= csrf_field() ?>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="from">
             <?= I18N::translateContext('Email sender', 'From') ?>
         </label>
@@ -36,7 +36,7 @@ use Fisharebest\Webtrees\I18N;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="to">
             <?= I18N::translateContext('Email recipient', 'To') ?>
         </label>
@@ -45,7 +45,7 @@ use Fisharebest\Webtrees\I18N;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="subject">
             <?= I18N::translate('Subject') ?>
         </label>
@@ -54,7 +54,7 @@ use Fisharebest\Webtrees\I18N;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="body">
             <?= I18N::translate('Message') ?>
         </label>
@@ -63,7 +63,7 @@ use Fisharebest\Webtrees\I18N;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="col-sm-3 col-form-label"></div>
         <div class="col-sm-9">
             <button type="submit" class="btn btn-primary">

diff --git a/resources/views/admin/location-edit.phtml b/resources/views/admin/location-edit.phtml
@@ -24,7 +24,7 @@ use Fisharebest\Webtrees\View;
 
 <h1><?= $title ?></h1>
 
-<div class="row form-group">
+<div class="row form-group mb-3">
     <div class="col-sm-12">
         <div id="osm-map" class="wt-ajax-load col-sm-12 osm-admin-map" dir="ltr"></div>
     </div>
@@ -35,7 +35,7 @@ use Fisharebest\Webtrees\View;
     <input type="hidden" name="parent_id" value="<?= e($parent->id()) ?>">
     <input type="hidden" name="place_id" value="<?= e($location->id()) ?>">
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-form-label col-sm-1" for="new_place_name">
             <?= I18N::translate('Place') ?>
         </label>
@@ -44,7 +44,7 @@ use Fisharebest\Webtrees\View;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-form-label col-sm-1" for="new_place_lati">
             <?= I18N::translate('Latitude') ?>
         </label>
@@ -55,7 +55,7 @@ use Fisharebest\Webtrees\View;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-form-label col-sm-1" for="new_place_long">
             <?= I18N::translate('Longitude') ?>
         </label>
@@ -66,7 +66,7 @@ use Fisharebest\Webtrees\View;
         </div>
     </div>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="col-sm-10 offset-sm-1">
             <button class="btn btn-primary" type="submit">
                 <?= /* I18N: A button label. */

diff --git a/resources/views/admin/map-import-form.phtml b/resources/views/admin/map-import-form.phtml
@@ -21,7 +21,7 @@ use Fisharebest\Webtrees\I18N;
     <?= csrf_field() ?>
 
     <!-- Server file -->
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-form-label col-sm-4" for="serverfile">
             <?= I18N::translate('A file on the server') ?>
         </label>
@@ -44,7 +44,7 @@ use Fisharebest\Webtrees\I18N;
     </div>
 
     <!-- local file -->
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-form-label col-sm-4" for="localfile">
             <?= I18N::translate('A file on your computer') ?>
         </label>
@@ -54,7 +54,7 @@ use Fisharebest\Webtrees\I18N;
     </div>
 
     <!-- Import options -->
-    <fieldset class="row form-group">
+    <fieldset class="row form-group mb-3">
         <legend class="col-form-label col-sm-4">
             <?= I18N::translate('Import') ?>
         </legend>
@@ -64,7 +64,7 @@ use Fisharebest\Webtrees\I18N;
     </fieldset>
 
     <!-- SAVE BUTTON -->
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="offset-sm-4 col-sm-8">
             <button type="submit" class="btn btn-primary">
                 <?= view('icons/save') ?>

diff --git a/resources/views/admin/media-upload.phtml b/resources/views/admin/media-upload.phtml
@@ -30,7 +30,7 @@ use Illuminate\Support\Collection;
     <?php for ($i = 1; $i <= $max_upload_files; $i++) : ?>
         <h2><?= I18N::translate('Media file') ?> <?= I18N::number($i) ?></h2>
 
-        <div class="row form-group">
+        <div class="row form-group mb-3">
             <label class="form-control-label col-sm-3" for="mediafile<?= e($i) ?>">
                 <?= I18N::translate('Media file to upload') ?>
                 <span class="visually-hidden"><?= e($i) ?></span>
@@ -40,7 +40,7 @@ use Illuminate\Support\Collection;
             </div>
         </div>
 
-        <div class="row form-group">
+        <div class="row form-group mb-3">
             <label class="form-control-label col-sm-3" for="filename<?= e($i) ?>">
                 <?= I18N::translate('Filename on server') ?>
                 <span class="visually-hidden"><?= e($i) ?></span>
@@ -53,7 +53,7 @@ use Illuminate\Support\Collection;
             </div>
         </div>
 
-        <div class="row form-group">
+        <div class="row form-group mb-3">
             <label class="form-control-label col-sm-3" for="folder_list<?= e($i) ?>">
                 <?= I18N::translate('Folder name on server') ?>
                 <span class="visually-hidden"><?= e($i) ?></span>

diff --git a/resources/views/admin/merge-records-step-1.phtml b/resources/views/admin/merge-records-step-1.phtml
@@ -45,7 +45,7 @@ use Fisharebest\Webtrees\View;
 <form method="post" action="<?= e(route(MergeRecordsAction::class, ['tree' => $tree->name()])) ?>">
     <?= csrf_field() ?>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <label class="col-sm-3 col-form-label" for="record-type">
             <?= I18N::translate('Select two records to merge.') ?>
         </label>
@@ -63,7 +63,7 @@ use Fisharebest\Webtrees\View;
         </div>
     </div>
 
-    <label class="row form-group">
+    <label class="row form-group mb-3">
         <span class="col-sm-3 col-form-label">
             <?= I18N::translate('First record') ?>
         </span>
@@ -101,7 +101,7 @@ use Fisharebest\Webtrees\View;
         </span>
     </label>
 
-    <label class="row form-group">
+    <label class="row form-group mb-3">
         <span class="col-sm-3 col-form-label">
             <?= I18N::translate('Second record') ?>
         </span>
@@ -139,7 +139,7 @@ use Fisharebest\Webtrees\View;
         </span>
     </label>
 
-    <div class="row form-group">
+    <div class="row form-group mb-3">
         <div class="col-sm-3">
         </div>