Skip to content

Combine sass #3791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 3 commits into from
Mar 9, 2017
Merged

Combine sass #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57be594
Allow using import in sass files
rullzer Mar 9, 2017
f2cf85f
[PoC] combine 2 scss files!
rullzer Mar 9, 2017
0c22a66
Add more styles to the server.scss
MorrisJobke Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 core/css/fixes.css → core/css/fixes.scss
View file
Open in desktop
File renamed without changes.
0 core/css/fonts.css → core/css/fonts.scss
View file
Open in desktop
File renamed without changes.
0 core/css/global.css → core/css/global.scss
View file
Open in desktop
File renamed without changes.
0 core/css/mobile.css → core/css/mobile.scss
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions core/css/server.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@import 'styles.scss';
@import 'inputs.scss';
@import 'header.scss';
@import 'icons.scss';
@import 'fonts.scss';
@import 'apps.scss';
@import 'global.scss';
@import 'fixes.scss';
@import 'multiselect.scss';
@import 'mobile.scss';
@import 'tooltip.scss';
21 changes: 18 additions & 3 deletions lib/private/Template/SCSSCacher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,17 @@ public function process($root, $file, $app) {
private function isCached($fileNameCSS, $fileNameSCSS, ISimpleFolder $folder, $path) {
try{
$cachedFile = $folder->getFile($fileNameCSS);
if( $cachedFile->getMTime() > filemtime($path.'/'.$fileNameSCSS)
&& $cachedFile->getSize() > 0 ) {
return true;
if ($cachedFile->getSize() > 0) {
$depFile = $folder->getFile($fileNameCSS . '.deps');
$deps = json_decode($depFile->getContent(), true);

foreach ($deps as $file=>$mtime) {
if (!file_exists($file) || filemtime($file) > $mtime) {
return false;
}
}
}
return true;
} catch(NotFoundException $e) {
return false;
}
Expand Down Expand Up @@ -140,6 +147,13 @@ private function cache($path, $fileNameCSS, $fileNameSCSS, ISimpleFolder $folder
$cachedfile = $folder->newFile($fileNameCSS);
}

$depFileName = $fileNameCSS . '.deps';
try {
$depFile = $folder->getFile($depFileName);
} catch (NotFoundException $e) {
$depFile = $folder->newFile($depFileName);
}

// Compile
try {
$compiledScss = $scss->compile('@import "'.$fileNameSCSS.'";');
Expand All @@ -150,6 +164,7 @@ private function cache($path, $fileNameCSS, $fileNameSCSS, ISimpleFolder $folder

try {
$cachedfile->putContent($this->rebaseUrls($compiledScss, $webDir));
$depFile->putContent(json_encode($scss->getParsedFiles()));
$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
return true;
} catch(NotFoundException $e) {
Expand Down
12 changes: 1 addition & 11 deletions lib/private/legacy/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,9 @@ public static function initTemplateEngine($renderAs) {
}
}

OC_Util::addStyle("tooltip",null,true);
OC_Util::addStyle('jquery-ui-fixes',null,true);
OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
OC_Util::addStyle("mobile",null,true);
OC_Util::addStyle("multiselect",null,true);
OC_Util::addStyle("fixes",null,true);
OC_Util::addStyle("global",null,true);
OC_Util::addStyle("apps",null,true);
OC_Util::addStyle("fonts",null,true);
OC_Util::addStyle("icons",null,true);
OC_Util::addStyle("header",null,true);
OC_Util::addStyle("inputs");
OC_Util::addStyle("styles",null,true);
OC_Util::addStyle('server', null, true);

// avatars
\OC_Util::addScript('jquery.avatar', null, true);
Expand Down