Fix: #2502 - fact media objects shouldn't float

7 files changed, 2 insertions, 96 deletions

diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php
index 3d06198284..8e9296996e 100644
--- a/app/Functions/FunctionsPrintFacts.php
+++ b/app/Functions/FunctionsPrintFacts.php
@@ -651,15 +651,12 @@ class FunctionsPrintFacts
             $media    = Factory::media()->make($media_id, $tree);
             if ($media) {
                 if ($media->canShow()) {
-                    if ($objectNum > 0) {
-                        echo '<br class="media-separator" style="clear:both;">';
-                    }
-                    echo '<div class="media-display"><div class="media-display-image">';
+                    echo '<div class="d-flex align-items-center"><div class="p-1">';
                     foreach ($media->mediaFiles() as $media_file) {
                         echo $media_file->displayImage(100, 100, 'contain', []);
                     }
                     echo '</div>';
-                    echo '<div class="media-display-title">';
+                    echo '<div>';
                     echo '<a href="', e($media->url()), '">', $media->fullName(), '</a>';
                     // NOTE: echo the notes of the media
                     echo '<p>';
@@ -670,26 +667,6 @@ class FunctionsPrintFacts
                         echo '<span class="label">', I18N::translate('Type'), ': </span> <span class="field">', $mediaType, '</span>';
                     }
                     //-- print spouse name for marriage events
-                    $ct = preg_match('/WT_SPOUSE: (.*)/', $factrec, $match);
-                    if ($ct > 0) {
-                        $spouse = Factory::individual()->make($match[1], $tree);
-                        if ($spouse) {
-                            echo '<a href="', e($spouse->url()), '">';
-                            echo $spouse->fullName();
-                            echo '</a>';
-                        }
-                        $ct = preg_match('/WT_FAMILY_ID: (.*)/', $factrec, $match);
-                        if ($ct > 0) {
-                            $famid  = trim($match[1]);
-                            $family = Factory::family()->make($famid, $tree);
-                            if ($family) {
-                                if ($spouse) {
-                                    echo ' - ';
-                                }
-                                echo '<a href="', e($family->url()), '">', I18N::translate('View this family'), '</a>';
-                            }
-                        }
-                    }
                     echo FunctionsPrint::printFactNotes($tree, $media->gedcom(), $nlevel);
                     echo self::printFactSources($tree, $media->gedcom(), $nlevel);
                     echo '</div>'; //close div "media-display-title"
diff --git a/resources/css/clouds.css b/resources/css/clouds.css
index 21f843e6f4..42a87a9bf2 100755
--- a/resources/css/clouds.css
+++ b/resources/css/clouds.css
@@ -1117,17 +1117,6 @@ div.faq_body {
     color: #fff;
 }
 
-/* ======== Indi tabs ======== */
-.media-display-image {
-    float: left;
-}
-
-.media-display-title {
-    float: left;
-    font-style: italic;
-    margin: 10px;
-}
-
 .upcoming_events_block button,
 .todays_events_block button {
     margin: 0 20px;
diff --git a/resources/css/colors.css b/resources/css/colors.css
index 8f3aebc1db..4ff8d83c37 100644
--- a/resources/css/colors.css
+++ b/resources/css/colors.css
@@ -1031,18 +1031,6 @@ div.faq_body {
     color: #fff;
 }
 
-/* ======== Indi tabs ======== */
-/* Facts & Events tab */
-.media-display-image {
-    float: left;
-}
-
-.media-display-title {
-    float: left;
-    font-style: italic;
-    margin: 10px;
-}
-
 /* Sidebar - Family navigator */
 .wt-family-navigator-dropdown-heading {
     font-weight: bold;
diff --git a/resources/css/fab.css b/resources/css/fab.css
index 1652959ed7..79a2a3284d 100755
--- a/resources/css/fab.css
+++ b/resources/css/fab.css
@@ -859,18 +859,6 @@ div.faq_body {
     color: #fff;
 }
 
-/* ======== Indi tabs ======== */
-/* Facts & Events tab */
-.media-display-image {
-    float: left;
-}
-
-.media-display-title {
-    float: left;
-    font-style: italic;
-    margin: 10px;
-}
-
 .upcoming_events_block button,
 .todays_events_block button {
     margin: 0 20px;
diff --git a/resources/css/minimal.css b/resources/css/minimal.css
index 0b86daa09c..660be4e5b0 100755
--- a/resources/css/minimal.css
+++ b/resources/css/minimal.css
@@ -556,18 +556,6 @@ div.faq_body {
     color: #fff;
 }
 
-/* ======== Indi tabs ======== */
-/* Facts & Events tab */
-.media-display-image {
-    float: left;
-}
-
-.media-display-title {
-    float: left;
-    font-style: italic;
-    margin: 10px;
-}
-
 .upcoming_events_block button,
 .todays_events_block button {
     margin: 0 20px;
diff --git a/resources/css/webtrees.css b/resources/css/webtrees.css
index f4d4315505..9ecfa9b734 100755
--- a/resources/css/webtrees.css
+++ b/resources/css/webtrees.css
@@ -1058,18 +1058,6 @@ div.faq_body {
     color: #fff;
 }
 
-/* ======== Indi tabs ======== */
-/* Facts & Events tab */
-.media-display-image {
-    float: left;
-}
-
-.media-display-title {
-    float: left;
-    font-style: italic;
-    margin: 10px;
-}
-
 /* Sidebar - Family navigator */
 .wt-family-navigator-dropdown {
     background: #edf7fd;
diff --git a/resources/css/xenea.css b/resources/css/xenea.css
index c69df8bb2e..6342182571 100755
--- a/resources/css/xenea.css
+++ b/resources/css/xenea.css
@@ -1048,18 +1048,6 @@ div.faq_body {
     color: #fff;
 }
 
-/* ======== Indi tabs ======== */
-/* Facts & Events tab */
-.media-display-image {
-    float: left;
-}
-
-.media-display-title {
-    float: left;
-    font-style: italic;
-    margin: 10px;
-}
-
 /* Sidebar - Family navigator */
 .wt-family-navigator-dropdown {
     background: #edf7fd;