diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2018-07-15 15:52:14 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2018-07-15 15:52:39 +0100 |
| commit | 8eeaee4755a863ed6ae7caaa177a9350de7a335c (patch) | |
| tree | 1f17fc5addb616d1b3e9baa6e99b62b81c49d4e6 | |
| parent | 5ccbfd66968e30c9938f6f141f90c245fabe15fb (diff) | |
| download | webtrees-8eeaee4755a863ed6ae7caaa177a9350de7a335c.tar.gz webtrees-8eeaee4755a863ed6ae7caaa177a9350de7a335c.tar.bz2 webtrees-8eeaee4755a863ed6ae7caaa177a9350de7a335c.zip | |
Move vendor stylesheets to layouts
| -rw-r--r-- | app/Theme/AbstractTheme.php | 17 | ||||
| -rw-r--r-- | resources/views/layouts/administration.php | 3 | ||||
| -rw-r--r-- | resources/views/layouts/default.php | 6 |
3 files changed, 12 insertions, 14 deletions
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php index 194e4a6228..c2d90105cd 100644 --- a/app/Theme/AbstractTheme.php +++ b/app/Theme/AbstractTheme.php @@ -1977,20 +1977,9 @@ abstract class AbstractTheme { * @return string[] */ public function stylesheets() { - - if (I18N::direction() === 'rtl') { - $stylesheets = [ - WT_ASSETS_URL . 'css/vendor-rtl.css', - self::STYLESHEET, - ]; - } else { - $stylesheets = [ - WT_ASSETS_URL . 'css/vendor.css', - self::STYLESHEET, - ]; - } - - return $stylesheets; + return [ + self::STYLESHEET, + ]; } /** diff --git a/resources/views/layouts/administration.php b/resources/views/layouts/administration.php index 825714146d..469db8f287 100644 --- a/resources/views/layouts/administration.php +++ b/resources/views/layouts/administration.php @@ -19,6 +19,9 @@ <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor.css') ?>"> <?php endif ?> <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/administration.css') ?>"> + + <?= View::stack('styles') ?> + <?= DebugBar::renderHead() ?> </head> <body class="container wt-global"> diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php index 8b6c23ec23..6adb319006 100644 --- a/resources/views/layouts/default.php +++ b/resources/views/layouts/default.php @@ -28,6 +28,12 @@ <link rel="icon" type="image/png" href="<?= Theme::theme()::ASSET_DIR ?>favicon192.png" sizes="192x192"> <link rel="apple-touch-icon" sizes="180x180" href="<?= Theme::theme()::ASSET_DIR ?>favicon180.png"> + <?php if (I18N::direction() === 'rtl'): ?> + <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor-rtl.css') ?>"> + <?php else: ?> + <link rel="stylesheet" type="text/css" href="<?= e(WT_ASSETS_URL . 'css/vendor.css') ?>"> + <?php endif ?> + <?php foreach (Theme::theme()->stylesheets() as $stylesheet): ?> <link rel="stylesheet" type="text/css" href="<?= $stylesheet ?>"> <?php endforeach ?> |