Skip to content

Commit

Permalink
Update settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Fedik committed Sep 27, 2018
1 parent b3d30a8 commit ebd0ef8
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
23 changes: 22 additions & 1 deletion build/build-modules-js/settings.json
Expand Up @@ -107,6 +107,27 @@
"dist/css/bootstrap-reboot.min.css.map": "css/bootstrap-reboot.min.css.map",
"scss": "scss"
},
"provideAssets": [
{
"name": "bootstrap.js",
"js": ["bootstrap.min.js"],
"dependencies": ["jquery"]
},
{
"name": "bootstrap.js.bundle",
"js": ["bootstrap.bundle.min.js"],
"dependencies": ["jquery"]
},
{
"name": "bootstrap.css",
"css": ["bootstrap.min.css"]
},
{
"name": "bootstrap.css.grid",
"css": ["bootstrap-grid.min.css"],
"dependencies": ["bootstrap.css"]
}
],
"dependencies": [],
"licenseFilename": "LICENSE"
},
Expand Down Expand Up @@ -313,7 +334,7 @@
"provideAssets": [
{
"name": null,
"js": ["jquery.minicolors.min.j"],
"js": ["jquery.minicolors.min.js"],
"css": ["jquery.minicolors.css"],
"dependencies": ["jquery"]
}
Expand Down
1 change: 1 addition & 0 deletions libraries/src/WebAsset/WebAssetRegistry.php
Expand Up @@ -126,6 +126,7 @@ public function __construct()
// Core registry files
$this->addRegistryFile('media/vendor/joomla.asset.json');
$this->addRegistryFile('media/system/joomla.asset.json');
$this->addRegistryFile('media/legacy/joomla.asset.json');

// Add for active component
$option = $app->input->get('option');
Expand Down

0 comments on commit ebd0ef8

Please sign in to comment.