Skip to content

Commit

Permalink
#80
Browse files Browse the repository at this point in the history
Solves this issue
  • Loading branch information
jmverges committed Feb 26, 2013
1 parent 714ddfc commit 999b1d2
Show file tree
Hide file tree
Showing 146 changed files with 20 additions and 10 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .travis.yml
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_css3.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_layout.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_reset-legacy.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_reset.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_support.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_typography.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/_utilities.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_appearance.scss
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_border-radius.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_box-shadow.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_box-sizing.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_box.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_columns.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_filter.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_font-face.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_hyphenation.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_images.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_inline-block.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_opacity.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_pie.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_regions.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_shared.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_text-shadow.scss
100644 → 100755
Empty file.
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_transform.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/css3/_transition.scss
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/layout/_stretching.scss
100644 → 100755
Empty file.
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/reset/_utilities.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/typography/_links.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/typography/_lists.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/typography/_text.scss
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/utilities/_color.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/utilities/_general.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/utilities/_print.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/utilities/_sprites.scss
100644 → 100755
Empty file.
Empty file modified Extensions/Compass/stylesheets/compass/utilities/_tables.scss
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Extensions/Own/Own.php
100644 → 100755
Empty file.
Empty file modified Extensions/Own/css/test/test2/test.scss
100644 → 100755
Empty file.
9 changes: 2 additions & 7 deletions Extensions/example.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
@import "test";
@import "compass/compass";


body {
content: demo-function();
@include border-radius();
body{
background: $blue;
}
1 change: 1 addition & 0 deletions Extensions/theme.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$blue:#fff;
Empty file modified README.md
100644 → 100755
Empty file.
20 changes: 17 additions & 3 deletions SassParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,23 @@ public function parse($source, $isFile = true) {
}

if (is_array($source)) {
$return = array();
foreach ($source as $source_file) {
$return = array_merge($return, $this->parse($source_file, TRUE));
$return = null;
foreach ($source as $key => $value) {
if(is_numeric($key)){
$code = $value;
$type = true;
} else {
$code = $key;
$type = $value;
}
if($return===null){
$return = $this->parse($code, $type);
} else {
$newNode = $this->parse($code, $type);
foreach($newNode->children as $children){
array_push($return->children,$children);
}
}
}
return $return;
}
Expand Down
Empty file modified VERSION
100644 → 100755
Empty file.
Empty file modified compile-apache.php
100644 → 100755
Empty file.
Empty file modified composer.json
100644 → 100755
Empty file.
Empty file modified script/literals/SassList.php
100644 → 100755
Empty file.
Empty file modified test.css
100644 → 100755
Empty file.
Empty file modified tests/alt.scss
100644 → 100755
Empty file.
Empty file modified tests/comments.css
100644 → 100755
Empty file.
Empty file modified tests/comments.sass
100644 → 100755
Empty file.
Empty file modified tests/content.css
100644 → 100755
Empty file.
Empty file modified tests/content.scss
100644 → 100755
Empty file.
Empty file modified tests/css3.css
100644 → 100755
Empty file.
Empty file modified tests/css3.scss
100644 → 100755
Empty file.
Empty file modified tests/default.css
100644 → 100755
Empty file.
Empty file modified tests/default.sass
100644 → 100755
Empty file.
Empty file modified tests/default_imported.sass
100644 → 100755
Empty file.
Empty file modified tests/each.css
100644 → 100755
Empty file.
Empty file modified tests/each.scss
100644 → 100755
Empty file.
Empty file modified tests/extend.css
100644 → 100755
Empty file.
Empty file modified tests/extend.sass
100644 → 100755
Empty file.
Empty file modified tests/extend_included.scss
100644 → 100755
Empty file.
Empty file modified tests/extend_placeholders.css
100644 → 100755
Empty file.
Empty file modified tests/extend_placeholders.scss
100644 → 100755
Empty file.
Empty file modified tests/filters.css
100644 → 100755
Empty file.
Empty file modified tests/filters.scss
100644 → 100755
Empty file.
Empty file modified tests/functions.css
100644 → 100755
Empty file.
Empty file modified tests/functions.scss
100644 → 100755
Empty file.
Empty file modified tests/holmes.css
100644 → 100755
Empty file.
Empty file modified tests/holmes.sass
100644 → 100755
Empty file.
Empty file modified tests/hsl-functions.css
100644 → 100755
Empty file.
Empty file modified tests/hsl-functions.scss
100644 → 100755
Empty file.
Empty file modified tests/interpolation.css
100644 → 100755
Empty file.
Empty file modified tests/interpolation.scss
100644 → 100755
Empty file.
Empty file modified tests/introspection.css
100644 → 100755
Empty file.
Empty file modified tests/introspection.scss
100644 → 100755
Empty file.
Empty file modified tests/list.css
100644 → 100755
Empty file.
Empty file modified tests/list.scss
100644 → 100755
Empty file.
Empty file modified tests/media.css
100644 → 100755
Empty file.
Empty file modified tests/media.scss
100644 → 100755
Empty file.
Empty file modified tests/misc-functions.css
100644 → 100755
Empty file.
Empty file modified tests/misc-functions.scss
100644 → 100755
Empty file.
Empty file modified tests/misc.css
100644 → 100755
Empty file.
Empty file modified tests/misc.scss
100644 → 100755
Empty file.
Empty file modified tests/mixin-ja1.css
100644 → 100755
Empty file.
Empty file modified tests/mixin-ja1.sass
100644 → 100755
Empty file.
Empty file modified tests/mixin-params.css
100644 → 100755
Empty file.
Empty file modified tests/mixin-params.scss
100644 → 100755
Empty file.
Empty file modified tests/nested-media.css
100644 → 100755
Empty file.
Empty file modified tests/nested-media.scss
100644 → 100755
Empty file.
Empty file modified tests/nested_import.css
100644 → 100755
Empty file.
Empty file modified tests/nested_media.css
100644 → 100755
Empty file.
Empty file modified tests/nested_media.scss
100644 → 100755
Empty file.
Empty file modified tests/nested_pseudo.css
100644 → 100755
Empty file.
Empty file modified tests/nested_pseudo.scss
100644 → 100755
Empty file.
Empty file modified tests/number.css
100644 → 100755
Empty file.
Empty file modified tests/number.scss
100644 → 100755
Empty file.
Empty file modified tests/opacity.css
100644 → 100755
Empty file.
Empty file modified tests/opacity.scss
100644 → 100755
Empty file.
Empty file modified tests/other-color.css
100644 → 100755
Empty file.
Empty file modified tests/other-color.scss
100644 → 100755
Empty file.
Empty file modified tests/phpSassTest.php
100644 → 100755
Empty file.
Empty file modified tests/phpunit.xml.dist
100644 → 100755
Empty file.
Empty file modified tests/proprietary-selector.css
100644 → 100755
Empty file.
Empty file modified tests/proprietary-selector.scss
100644 → 100755
Empty file.
Empty file modified tests/rgb-functions.css
100644 → 100755
Empty file.
Empty file modified tests/rgb-functions.scss
100644 → 100755
Empty file.
Empty file modified tests/splats.css
100644 → 100755
Empty file.
Empty file modified tests/splats.scss
100644 → 100755
Empty file.
Empty file modified tests/string.css
100644 → 100755
Empty file.
Empty file modified tests/string.scss
100644 → 100755
Empty file.
Empty file modified tree/SassMediaNode.php
100644 → 100755
Empty file.
Empty file modified tree/SassWarnNode.php
100644 → 100755
Empty file.

0 comments on commit 999b1d2

Please sign in to comment.