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

Merge branch 'develop' into pr/advanced-mailer

Browse source
This commit is contained in:
Kijin Sung 2016-05-07 14:50:57 +09:00
commit 062969ae25
14 changed files with 94 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/framework/formatter.php
View file

@ -333,7 +333,21 @@ class Formatter
$import_content = '';
$import_files = array_map(function($str) use($filename, $import_type) {
$str = trim(trim(trim(preg_replace('/^url\\(([^()]+)\\)$/', '$1', trim($str))), '"\''));
return dirname($filename) . '/' . ($import_type === 'scss' ? "_$str.scss" : $str);
if ($import_type === 'scss')
{
if (($dirpos = strrpos($str, '/')) !== false)
{
return dirname($filename) . '/' . substr($str, 0, $dirpos) . '/_' . substr($str, $dirpos + 1) . '.scss';
}
else
{
return dirname($filename) . "/_$str.scss";
}
}
else
{
return dirname($filename) . '/' . $str;
}
}, explode(',', $matches[1]));
foreach ($import_files as $import_filename)
{