fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Use font config in rhymix.scss to set defaults

Browse source
This commit is contained in:
Kijin Sung 2016-05-05 11:05:06 +09:00
parent 67cc7d3d00
commit 398c36885a
3 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -267,18 +267,19 @@ class FrontEndFileHandler extends Handler
return;
}
if ($default_font_config = Context::get('default_font_config'))
{
$file->vars = array_merge($file->vars, $default_font_config);
}
$compiledFileName = $file->fileName . ($minify ? '.min' : '') . '.css';
$compiledFileHash = sha1($file->fileRealPath . ':' . serialize($vars));
$compiledFileHash = sha1($file->fileRealPath . ':' . serialize($file->vars));
$compiledFilePath = \RX_BASEDIR . self::$assetdir . '/compiled/' . $compiledFileHash . '.' . $compiledFileName;
if (!file_exists($compiledFilePath) || filemtime($compiledFilePath) < filemtime($file->fileFullPath))
{
$method_name = 'compile' . $file->fileExtension;
$success = Rhymix\Framework\Formatter::$method_name($file->fileFullPath, $compiledFilePath, $file->vars, $minify);
if ($success === false)
{
return;
}
}
$file->fileName = $compiledFileHash . '.' . $compiledFileName;