Merge pull request #320 from e3media/develop

Florian Eckerstorfer · Florian Eckerstorfer · commit 22237fe6bd25 · 2014-11-11T12:43:14.000+01:00
Adjust path to bootstrap.scss-file
diff --git a/DependencyInjection/AsseticConfiguration.php b/DependencyInjection/AsseticConfiguration.php
@@ -105,7 +105,7 @@ protected function buildCssWithLess(array $config)
      */
     protected function buildCssWithSass(array $config)
     {
-        $bootstrapFile = $config['assets_dir'].'/stylesheets/bootstrap.scss';
+        $bootstrapFile = $config['assets_dir'].'/stylesheets/_bootstrap.scss';
         if (true === isset($config['customize']['variables_file']) &&
             null !== $config['customize']['variables_file']) {
             $bootstrapFile = $config['customize']['bootstrap_output'];

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected function buildCssWithLess(array $config)`
`105`	`105`	`*/`
`106`	`106`	`protected function buildCssWithSass(array $config)`
`107`	`107`	`{`
`108`		`- $bootstrapFile = $config['assets_dir'].'/stylesheets/bootstrap.scss';`
	`108`	`+ $bootstrapFile = $config['assets_dir'].'/stylesheets/_bootstrap.scss';`
`109`	`109`	`if (true === isset($config['customize']['variables_file']) &&`
`110`	`110`	`null !== $config['customize']['variables_file']) {`
`111`	`111`	`$bootstrapFile = $config['customize']['bootstrap_output'];`