Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-05 04:46:03 +01:00
Code Issues Packages Projects Releases Activity

Moved CSS preset compile

Browse Source
This commit is contained in:
Andy Miller
2021-04-15 14:13:33 -06:00
parent dbfe699c80
commit a47cef44a5
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.10.13
## mm/dd/2021
1. [](#bugfix)
* Moved preset CSS compile to earlier in the process to ensure compilation happens in time.
# v1.10.12 # v1.10.12
## 04/15/2021 ## 04/15/2021

15
admin.php
View File

@@ -578,13 +578,6 @@ class AdminPlugin extends Plugin
$assets->setJsPipeline(false); $assets->setJsPipeline(false);
$assets->setCssPipeline(false); $assets->setCssPipeline(false);
// Compile a missing preset.css file
$preset_css = 'asset://admin-preset.css';
$preset_path = $this->grav['locator']->findResource($preset_css);
if (!$preset_path) {
$this->grav['admin-whitelabel']->compilePresetScss($this->config->get('plugins.admin.whitelabel'));
}
} }
/** /**
@@ -600,6 +593,7 @@ class AdminPlugin extends Plugin
$twig_paths[] = __DIR__ . '/themes/' . $this->theme . '/templates'; $twig_paths[] = __DIR__ . '/themes/' . $this->theme . '/templates';
$this->grav['twig']->twig_paths = $twig_paths; $this->grav['twig']->twig_paths = $twig_paths;
} }
/** /**
@@ -1116,6 +1110,13 @@ class AdminPlugin extends Plugin
// Initialize white label functionality // Initialize white label functionality
$this->grav['admin-whitelabel'] = new WhiteLabel(); $this->grav['admin-whitelabel'] = new WhiteLabel();
// Compile a missing preset.css file
$preset_css = 'asset://admin-preset.css';
$preset_path = $this->grav['locator']->findResource($preset_css);
if (!$preset_path) {
$this->grav['admin-whitelabel']->compilePresetScss($this->config->get('plugins.admin.whitelabel'));
}
// These events are needed for login. // These events are needed for login.
$this->enable([ $this->enable([
'onTwigExtensions' => ['onTwigExtensions', 1000], 'onTwigExtensions' => ['onTwigExtensions', 1000],