From: Alan Knowles <alan@roojs.com>
Date: Wed, 16 Dec 2020 06:10:59 +0000 (+0800)
Subject: AssetTrait.php
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=ce010fb57acb72a9c6a19b4fd297df622755d709;p=Pman.Core

AssetTrait.php
---

diff --git a/AssetTrait.php b/AssetTrait.php
index 283ab4ef..ef59299f 100644
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -335,32 +335,16 @@ trait Pman_Core_AssetTrait {
                 die("INSTALL sassc");
             }
                  
-            $tmpFile = $this->tempName( "scss");
-                file_put_contents($tmpFile, "{$f['variables']}\n@import \"{$file}\";\n");
-                echo file_get_contents($tmpFile);
+            $fd = dirname($fd);
                 
                 
-                
-                $cmd = "{$sassc}  --sourcemap=auto -I {$f['scssDir']} $tmpFile {$f['baseDir']}/{$f['name']}";
-                echo "$cmd\n";
-                echo `$cmd`;
-                $cmd = "{$sassc} --style=compressed --sourcemap=auto -I {$f['scssDir']} $tmpFile {$f['baseDir']}/{$f['minify']}";
-                echo "$cmd\n";
-                echo `$cmd`;
-            
-            
-            require_once 'HTML/Scss.php';
-            $scss = new HTML_Scss();
-         
+            $cmd = "{$sassc}  --sourcemap=auto -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $fp {$compiledir}/{$output}";
+            echo "$cmd\n";
+            echo `$cmd`;
             
-            $scss->setImportPaths(array(dirname($fp), $this->rootDir .'/roojs1/scss/bootstrap'));
-            $scss->setFormatter('Expanded');
-             
-            echo $scss->compile("@import \"{$smod}.scss\";");
             exit;
-             
-            file_put_contents($compiledir.'/'.$output, $scss->compile("@import \"{$smod}.scss\";"));
             
+             
             //print_r($relfiles);
             
             require_once 'HTML/SCSS.php';