diff --git a/composer.json b/composer.json index 33b916249214e4d0ae9a36b25a39b316e703cc74..16c556917f9447b6b6d771a1d07afddefe4c7da2 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ ], "require": { "bower-asset/animate-sass": "~0.6.0", - "bower-asset/bootstrap-sass": "~3.3.5", + "bower-asset/bootstrap-sass": "~3.3.7", "bower-asset/flat-ui-sass": "~2.1.3", "bower-asset/fontawesome": "~4.7.0", "ckeditorplugin/codesnippet": "master", @@ -59,7 +59,7 @@ "drupal/admin_toolbar": "1.18", "drupal/avatars": "1.0-beta5", "drupal/block_class": "1.x-dev", - "drupal/bootstrap": "3.1.0", + "drupal/bootstrap": "3.2.0", "drupal/bootstrap_clean_blog": "1.0-rc2", "drupal/browser_refresh": "1.3", "drupal/codesnippet": "^1.6", @@ -109,9 +109,8 @@ "drupal/videojs": "1.0", "drupal/xmlsitemap": "1.0.0-alpha2", "drush/drush": "~8.0", - "lakedrops/d8-project-scaffold": "~0", - "lakedrops/theme-d8-sass": "~0", - "oomphinc/composer-installers-extender": "^1.1.1" + "lakedrops/d8-project-scaffold": "latest", + "lakedrops/theme-d8-sass": "latest" }, "require-dev": { "behat/mink": "~1.7", @@ -129,7 +128,10 @@ "prefer-stable": true, "scripts": { "drupal-scaffold": "LakeDrops\\Drupal8Scaffold\\Plugin::scaffold", - "drupal-theme-update": "LakeDrops\\Drupal8Theme\\SASS\\Plugin::updateTheme" + "drupal-theme-install": "LakeDrops\\Drupal8Theme\\SASS\\Plugin::init", + "drupal-theme-update": "LakeDrops\\Drupal8Theme\\SASS\\Plugin::update", + "drupal-theme-reset": "LakeDrops\\Drupal8Theme\\SASS\\Plugin::reset", + "drupal-theme-overwrite": "LakeDrops\\Drupal8Theme\\SASS\\Plugin::overwrite" }, "config": { "preferred-install": { @@ -149,7 +151,6 @@ "sites/example.sites.php" ] }, - "installer-types": ["library"], "installer-paths": { "web/core": [ "type:drupal-core" @@ -167,9 +168,7 @@ "type:drupal-custom-theme" ], "web/libraries/{$name}": [ - "type:drupal-library", - "vendor:bower-asset", - "vendor:npm-asset" + "type:drupal-library" ], "drush/contrib/{$name}": [ "type:drupal-drush" @@ -177,43 +176,57 @@ }, "theme-d8-sass": { "project_name": "mytheme", - "copy_starterkit": false, + "base_theme": { + "name": "bootstrap", + "package": "drupal/bootstrap", + "starterkit": "starterkits/sass", + "sasspath": "scss", + "import": ["overrides"] + }, "bower_assets": { - "global": true, - "fonts": { - "bootstrap-sass": { - "src": "assets/fonts/bootstrap", - "dest": "bootstrap" + "bootstrap-sass": { + "name": "bootstrap", + "version": "~3.3.7", + "fonts": { + "src": "assets/fonts/bootstrap" }, - "flat-ui-sass": { - "src": "vendor/assets/fonts/flat-ui", - "dest": "flat-ui" + "sass": { + "src": "assets/stylesheets", + "import": ["bootstrap"] }, - "fontawesome": { - "src": "fonts", - "dest": "" + "js": { + "src": "assets/javascripts/bootstrap" } }, - "sass": { - "bootstrap-sass": { - "src": "assets/stylesheets", - "version": "~3.3.5", - "import": ["bootstrap", "overrides"] + "flat-ui-sass": { + "name": "flat-ui", + "fonts": { + "src": "vendor.assets/fonts.flat-ui" }, - "flat-ui-sass": { - "src": "vendor/assets/stylesheets", - "version": "~2.1.3", - "import": ["flat-ui/variables", "flat-ui"] + "sass": { + "src": "vendor.assets/stylesheets", + "import": ["flat-ui"] }, - "fontawesome": { + "js": { + "src": "vendor.assets/javascripts" + } + }, + "fontawesome": { + "name": "fontawesome", + "fonts": { + "src": "fonts" + }, + "sass": { "src": "scss", - "version": "~4.7.0", "import": ["font-awesome"] - }, - "animate-sass": { + } + }, + "animate-sass": { + "name": "animate", + "sass": { "src": "", - "version": "~0.6.0", - "import": ["animate"] + "import": ["animate"], + "modules": ["bounceIn"] } } }