diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/css/_base.css | 8 | ||||
| -rw-r--r-- | resources/views/admin/control-panel.phtml | 3 | ||||
| -rw-r--r-- | resources/views/layouts/administration.phtml | 3 | ||||
| -rw-r--r-- | resources/views/layouts/default.phtml | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/resources/css/_base.css b/resources/css/_base.css index 23f0a42de7..f5f06b5704 100644 --- a/resources/css/_base.css +++ b/resources/css/_base.css @@ -28,6 +28,14 @@ } /* + * Chrome 72 has problems with all cards in the control panel. + * Chrome 73 has problems with the family-tree card in the control panel. + */ +.wt-route-admin-control-panel .card { + display: block; +} + +/* * Flexbox fixes for IE11 */ @media (-ms-high-contrast: active), (-ms-high-contrast: none) { diff --git a/resources/views/admin/control-panel.phtml b/resources/views/admin/control-panel.phtml index 360c59e3dd..a36b9d5384 100644 --- a/resources/views/admin/control-panel.phtml +++ b/resources/views/admin/control-panel.phtml @@ -96,8 +96,7 @@ </div> <!-- FAMILY TREES --> -<!-- d-block allows tables in cards in Chrome --> -<div class="card mb-4 d-block <?= array_sum($changes) ? 'card-outline-danger' : '' ?>"> +<div class="card mb-4 <?= array_sum($changes) ? 'card-outline-danger' : '' ?>"> <div class="card-header"> <h2 class="mb-0"> <?= I18N::translate('Family trees') ?> diff --git a/resources/views/layouts/administration.phtml b/resources/views/layouts/administration.phtml index 15c73000cc..30952c440c 100644 --- a/resources/views/layouts/administration.phtml +++ b/resources/views/layouts/administration.phtml @@ -2,6 +2,7 @@ <?php use Fisharebest\Webtrees\FlashMessages; ?> <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\View; ?> +<?php use Symfony\Component\HttpFoundation\Request; ?> <!DOCTYPE html> <html dir="<?= I18N::direction() ?>" lang="<?= WT_LOCALE ?>"> @@ -21,7 +22,7 @@ <?= DebugBar::renderHead() ?> </head> - <body class="container wt-global"> + <body class="container wt-global wt-route-<?= e(app(Request::class)->get('route')) ?>"> <header> <div class="wt-accessibility-links position-fixed"> <a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content"> diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml index c70096a3e6..1215f73b11 100644 --- a/resources/views/layouts/default.phtml +++ b/resources/views/layouts/default.phtml @@ -1,4 +1,3 @@ -<?php use Fisharebest\Webtrees\Auth; ?> <?php use Fisharebest\Webtrees\DebugBar; ?> <?php use Fisharebest\Webtrees\FlashMessages; ?> <?php use Fisharebest\Webtrees\I18N; ?> @@ -60,7 +59,7 @@ <?= DebugBar::renderHead() ?> </head> - <body class="wt-global wt-theme-<?= e(app(ModuleThemeInterface::class)->name()) ?> wt-route-<?= e(e(app(Request::class)->get('route'))) ?>"> + <body class="wt-global wt-theme-<?= e(app(ModuleThemeInterface::class)->name()) ?> wt-route-<?= e(app(Request::class)->get('route')) ?>"> <header class="wt-header-wrapper d-print-none"> <div class="container wt-header-container"> <div class="row wt-header-content"> |