Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Górny committed Aug 10, 2016
1 parent 6682591 commit 5ed4687
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DependencyInjection/AsseticConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ protected function buildCssWithLess(array $config)
*/
protected function buildCssWithSass(array $config)
{
$bootstrapFile = $config['assets_dir'].'/stylesheets/_bootstrap.scss';
$bootstrapFile = $config['assets_dir'].'/stylesheets/'.$config['twbs_sass_file'];
if (true === isset($config['customize']['variables_file']) &&
null !== $config['customize']['variables_file']) {
$bootstrapFile = $config['customize']['bootstrap_output'];
Expand Down
6 changes: 6 additions & 0 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ class Configuration implements ConfigurationInterface
/** @var string */
const DEFAULT_FONTS_DIR = '%kernel.root_dir%/../web/fonts';

/** @var string */
const DEFAULT_BOOTSTRAP_SASS_FILE = '_bootstrap.scss';

/**
* {@inheritDoc}
*/
Expand All @@ -68,6 +71,9 @@ private function buildConfigTree()
->scalarNode('assets_dir')
->defaultValue(self::DEFAULT_ASSETS_DIR)
->end()
->scalarNode('twbs_sass_file')
->defaultValue(self::DEFAULT_BOOTSTRAP_SASS_FILE)
->end()
->scalarNode('fontawesome_dir')
->defaultValue(self::DEFAULT_FONTAWESOME_DIR)
->end()
Expand Down
49 changes: 49 additions & 0 deletions Resources/sass/bootstrap4.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Core variables and mixins
@import "../../../../../../../twbs/bootstrap/scss/variables";
@import "../../../../../../../twbs/bootstrap/scss/mixins";

// Reset
@import "../../../../../../../twbs/bootstrap/scss/normalize";
@import "../../../../../../../twbs/bootstrap/scss/print";

// Core CSS
@import "../../../../../../../twbs/bootstrap/scss/scaffolding";
@import "../../../../../../../twbs/bootstrap/scss/type";
@import "../../../../../../../twbs/bootstrap/scss/code";
@import "../../../../../../../twbs/bootstrap/scss/grid";
@import "../../../../../../../twbs/bootstrap/scss/tables";
@import "../../../../../../../twbs/bootstrap/scss/forms";
@import "../../../../../../../twbs/bootstrap/scss/buttons";

// Components
@import "../../../../../../../twbs/bootstrap/scss/component-animations";
@import "../../../../../../../twbs/bootstrap/scss/glyphicons";
@import "../../../../../../../twbs/bootstrap/scss/dropdowns";
@import "../../../../../../../twbs/bootstrap/scss/button-groups";
@import "../../../../../../../twbs/bootstrap/scss/input-groups";
@import "../../../../../../../twbs/bootstrap/scss/navs";
@import "../../../../../../../twbs/bootstrap/scss/navbar";
@import "../../../../../../../twbs/bootstrap/scss/breadcrumbs";
@import "../../../../../../../twbs/bootstrap/scss/pagination";
@import "../../../../../../../twbs/bootstrap/scss/pager";
@import "../../../../../../../twbs/bootstrap/scss/labels";
@import "../../../../../../../twbs/bootstrap/scss/badges";
@import "../../../../../../../twbs/bootstrap/scss/jumbotron";
@import "../../../../../../../twbs/bootstrap/scss/thumbnails";
@import "../../../../../../../twbs/bootstrap/scss/alerts";
@import "../../../../../../../twbs/bootstrap/scss/progress-bars";
@import "../../../../../../../twbs/bootstrap/scss/media";
@import "../../../../../../../twbs/bootstrap/scss/list-group";
@import "../../../../../../../twbs/bootstrap/scss/panels";
@import "../../../../../../../twbs/bootstrap/scss/wells";
@import "../../../../../../../twbs/bootstrap/scss/close";

// Components w/ JavaScript
@import "../../../../../../../twbs/bootstrap/scss/modals";
@import "../../../../../../../twbs/bootstrap/scss/tooltip";
@import "../../../../../../../twbs/bootstrap/scss/popovers";
@import "../../../../../../../twbs/bootstrap/scss/carousel";

// Utility classes
@import "../../../../../../../twbs/bootstrap/scss/utilities";
@import "../../../../../../../twbs/bootstrap/scss/responsive-utilities";

0 comments on commit 5ed4687

Please sign in to comment.