diff options
| -rw-r--r-- | app/Controller/FamilyBookController.php | 6 | ||||
| -rw-r--r-- | app/Controller/HourglassController.php | 6 | ||||
| -rw-r--r-- | app/Functions/FunctionsCharts.php | 12 | ||||
| -rw-r--r-- | themes/_common/css-1.7.8/style.css | 34 | ||||
| -rw-r--r-- | themes/clouds/css-1.7.8/style.css | 10 | ||||
| -rw-r--r-- | themes/colors/css-1.7.8/style.css | 10 | ||||
| -rw-r--r-- | themes/fab/css-1.7.8/style.css | 10 | ||||
| -rw-r--r-- | themes/minimal/css-1.7.8/style.css | 11 | ||||
| -rw-r--r-- | themes/webtrees/css-1.7.8/style.css | 10 | ||||
| -rw-r--r-- | themes/xenea/css-1.7.8/style.css | 10 |
10 files changed, 46 insertions, 73 deletions
diff --git a/app/Controller/FamilyBookController.php b/app/Controller/FamilyBookController.php index d281950a38..492dec955a 100644 --- a/app/Controller/FamilyBookController.php +++ b/app/Controller/FamilyBookController.php @@ -152,7 +152,7 @@ class FamilyBookController extends ChartController { if ($person) { FunctionsPrint::printPedigreePerson($person); echo '</td><td>', - '<img class="line2" src="', Theme::theme()->parameter('image-hline'), '" width="8" height="3">'; + '<img class="linef1" src="', Theme::theme()->parameter('image-hline'), '" width="8" height="3">'; } else { echo '<div style="width:', $this->getBoxDimensions()->width + 19, 'px; height:', $this->getBoxDimensions()->height + 8, 'px;"></div>', '</td><td>'; @@ -253,7 +253,7 @@ class FamilyBookController extends ChartController { } echo '<img class="line3 pvline" src="', Theme::theme()->parameter('image-vline'), '" width="3" height="', $lh, '"></td>', '<td>', - '<img class="line4" src="', Theme::theme()->parameter('image-hline'), '" height="3"></td>', + '<img class="linef2" src="', Theme::theme()->parameter('image-hline'), '" height="3"></td>', '<td>'; $lh = $savlh; // restore original line height //-- print the father box @@ -277,7 +277,7 @@ class FamilyBookController extends ChartController { } echo '</tr><tr>', '<td class="tdtop"><img class="pvline" src="', Theme::theme()->parameter('image-vline'), '" width="3" height="', $lh, '"></td>', - '<td><img class="line4" src="', Theme::theme()->parameter('image-hline'), '" height="3"></td>', + '<td><img class="linef3" src="', Theme::theme()->parameter('image-hline'), '" height="3"></td>', '<td>'; //-- print the mother box FunctionsPrint::printPedigreePerson($family->getWife()); diff --git a/app/Controller/HourglassController.php b/app/Controller/HourglassController.php index 7ba2cecf5d..e3d40740f3 100644 --- a/app/Controller/HourglassController.php +++ b/app/Controller/HourglassController.php @@ -112,7 +112,7 @@ class HourglassController extends ChartController { echo '<table cellspacing="0" cellpadding="0" border="0" class="hourglassChart">'; echo '<tr>'; echo '<td style="vertical-align:bottom"><img class="line3 pvline" src="' . Theme::theme()->parameter('image-vline') . '" width="3"></td>'; - echo '<td><img class="line4" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3"></td>'; + echo '<td><img class="lineh2" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3"></td>'; echo '<td>'; //-- print the father box FunctionsPrint::printPedigreePerson($family->getHusband()); @@ -144,7 +144,7 @@ class HourglassController extends ChartController { echo '</tr><tr>', "<td style='vertical-align:top'><img class='pvline' src='" . Theme::theme()->parameter('image-vline') . "' width='3' alt=''></td>", - '<td><img class="line4" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3"></td>', + '<td><img class="lineh3" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3"></td>', '<td>'; //-- print the mother box FunctionsPrint::printPedigreePerson($family->getWife()); @@ -280,7 +280,7 @@ class HourglassController extends ChartController { echo '<table cellspacing="0" cellpadding="0" border="0" id="table2_' . $pid . '"><tr><td>'; FunctionsPrint::printPedigreePerson($person); - echo '</td><td><img class="line2" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3">'; + echo '</td><td><img class="lineh1" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3">'; //----- Print the spouse if ($this->show_spouse) { diff --git a/app/Functions/FunctionsCharts.php b/app/Functions/FunctionsCharts.php index cf06d6d3f7..7307866dd3 100644 --- a/app/Functions/FunctionsCharts.php +++ b/app/Functions/FunctionsCharts.php @@ -112,8 +112,8 @@ class FunctionsCharts { $hfam = $husb->getPrimaryChildFamily(); if ($hfam) { // remove the|| test for $sosa - echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight -14 ) . '"></td>'; - echo '<td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; + echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight -14 ) . '"></td>'; + echo '<td><img class="linea1 lined1" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; // husband’s father if ($hfam && $hfam->getHusband()) { echo '<table cellspacing="0" cellpadding="0" border="0"><tr>'; @@ -142,7 +142,7 @@ class FunctionsCharts { } if ($hfam) { // husband’s mother - echo '</tr><tr><td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; + echo '</tr><tr><td><img class="linea2 lined2" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; if ($hfam && $hfam->getWife()) { echo '<table cellspacing="0" cellpadding="0" border="0"><tr>'; if ($sosa > 0) { @@ -203,7 +203,7 @@ class FunctionsCharts { $hfam = $wife->getPrimaryChildFamily(); if ($hfam) { echo '<td rowspan="2"><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td rowspan="2"><img src="' . Theme::theme()->parameter('image-vline') . '" width="3" height="' . ($pbheight -14 ) . '"></td>'; - echo '<td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; + echo '<td><img class="linea3 lined3" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; // wife’s father if ($hfam && $hfam->getHusband()) { echo '<table cellspacing="0" cellpadding="0" border="0"><tr>'; @@ -233,7 +233,7 @@ class FunctionsCharts { } if ($hfam) { // wife’s mother - echo '</tr><tr><td><img src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; + echo '</tr><tr><td><img class="linea4 lined4" src="' . Theme::theme()->parameter('image-hline') . '"></td><td>'; if ($hfam && $hfam->getWife()) { echo '<table cellspacing="0" cellpadding="0" border="0"><tr>'; if ($sosa > 0) { @@ -364,7 +364,7 @@ class FunctionsCharts { if ($div) { echo '–', $div->getDate()->minimumDate()->format('%Y'); } - echo '<img class="line5" width="100%" height="3" src="' . Theme::theme()->parameter('image-hline') . '">'; + echo '<img class="linea5 lined5 " width="100%" height="3" src="' . Theme::theme()->parameter('image-hline') . '">'; } else { echo '<img width="100%" height="3" src="' . Theme::theme()->parameter('image-hline') . '">'; } echo '</td>'; diff --git a/themes/_common/css-1.7.8/style.css b/themes/_common/css-1.7.8/style.css index 3a418b1f6e..659619b486 100644 --- a/themes/_common/css-1.7.8/style.css +++ b/themes/_common/css-1.7.8/style.css @@ -157,6 +157,40 @@ .wt-ajax-load:empty { } +/* + * These selectors control how the short horizontal lines are positioned in the Charts + * Optimized for Win10 and FF, Chrome and Edge browsers + * Ancestors + * Descendants + * amily book + * Hourglass chart + * + * */ + +/* Ascentors */ +.wt-ancestors-chart .linea1 {margin-bottom: 4px;} +.wt-ancestors-chart .linea2 {margin-bottom: 7px;} +.wt-ancestors-chart .linea3 {margin-bottom: 4px;} +.wt-ancestors-chart .linea4 {margin-bottom: 7px;} +.wt-ancestors-chart .linea5 {vertical-align: top;} + +/* Descendants */ +.wt-descendants-chart .lined1 {margin-bottom: 4px;} +.wt-descendants-chart .lined2 {margin-bottom: 7px;} +.wt-descendants-chart .lined3 {margin-bottom: 4px;} +.wt-descendants-chart .lined4 {margin-bottom: 7px;} +.wt-descendants-chart .linea5 {vertical-align: top;} + +/* Family book */ +.linef1 {margin-bottom: 3px;} +.linef2 {margin-bottom: 3px;} +.linef3 {margin-bottom: 7px;} + +/* Hourglass */ +.lineh1 {margin-bottom: 4px;} +.lineh2 {margin-bottom: 4px;} +.lineh3 {margin-bottom: 7px;} + /* * Ancestors chart * diff --git a/themes/clouds/css-1.7.8/style.css b/themes/clouds/css-1.7.8/style.css index bca74c10fd..525fcd0143 100644 --- a/themes/clouds/css-1.7.8/style.css +++ b/themes/clouds/css-1.7.8/style.css @@ -1497,16 +1497,6 @@ a:hover .nameZoom { vertical-align: bottom; } -.line1, -.line2, -.line3 { - vertical-align: middle; -} - -.line5 { - vertical-align: top; -} - #childbox { padding: 5px; position: absolute; diff --git a/themes/colors/css-1.7.8/style.css b/themes/colors/css-1.7.8/style.css index a619e81d98..fb4a543803 100644 --- a/themes/colors/css-1.7.8/style.css +++ b/themes/colors/css-1.7.8/style.css @@ -1380,16 +1380,6 @@ a:hover .nameZoom { vertical-align: bottom; } -.line1, -.line2, -.line3 { - vertical-align: middle; -} - -.line5 { - vertical-align: top; -} - #childbox { padding: 5px; position: absolute; diff --git a/themes/fab/css-1.7.8/style.css b/themes/fab/css-1.7.8/style.css index 68d9a052d0..9df4636bb0 100644 --- a/themes/fab/css-1.7.8/style.css +++ b/themes/fab/css-1.7.8/style.css @@ -923,16 +923,6 @@ a:hover .nameZoom { vertical-align: bottom; } -.line1, -.line2, -.line3 { - vertical-align: middle; -} - -.line5 { - vertical-align: top; -} - #childbox { padding: 5px; position: absolute; diff --git a/themes/minimal/css-1.7.8/style.css b/themes/minimal/css-1.7.8/style.css index db47ae630f..bbd78ea725 100644 --- a/themes/minimal/css-1.7.8/style.css +++ b/themes/minimal/css-1.7.8/style.css @@ -2833,17 +2833,6 @@ div.faq_body { vertical-align: bottom; } -.line1, -.line2, -.line3 { - vertical-align: middle; -} - -.line5 { - vertical-align: top; -} - - .optionbox, .descriptionbox { border: solid #000 1px; padding: 3px; diff --git a/themes/webtrees/css-1.7.8/style.css b/themes/webtrees/css-1.7.8/style.css index 04fb2da362..e5a1e564a8 100644 --- a/themes/webtrees/css-1.7.8/style.css +++ b/themes/webtrees/css-1.7.8/style.css @@ -1408,16 +1408,6 @@ a:hover .nameZoom { vertical-align: bottom; } -.line1, -.line2, -.line3 { - vertical-align: middle; -} - -.line5 { - vertical-align: top; -} - #childbox { padding: 5px; position: absolute; diff --git a/themes/xenea/css-1.7.8/style.css b/themes/xenea/css-1.7.8/style.css index 92c8cc933c..488872cb94 100644 --- a/themes/xenea/css-1.7.8/style.css +++ b/themes/xenea/css-1.7.8/style.css @@ -1412,16 +1412,6 @@ a:hover .nameZoom { vertical-align: bottom; } -.line1, -.line2, -.line3 { - vertical-align: middle; -} - -.line5 { - vertical-align: top; -} - #childbox { padding: 5px; position: absolute; |