Skip to content

Commit

Permalink
fix invalid resources paths, fix small style issues
Browse files Browse the repository at this point in the history
  • Loading branch information
koertho committed Oct 31, 2023
1 parent 94c705b commit 2864908
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions config/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
huh_encore:
templates:
imports:
- { name: default_css, template: "@HeimrichHannotContaoEncore/encore_css_imports.html.twig" }
- { name: default_js, template: "@HeimrichHannotContaoEncore/encore_js_imports.html.twig" }
- { name: default_head_js, template: "@HeimrichHannotContaoEncore/encore_head_js_imports.html.twig" }
- { name: default_css, template: "@HeimrichHannotEncore/encore_css_imports.html.twig" }
- { name: default_js, template: "@HeimrichHannotEncore/encore_js_imports.html.twig" }
- { name: default_head_js, template: "@HeimrichHannotEncore/encore_head_js_imports.html.twig" }
4 changes: 2 additions & 2 deletions docs/developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,6 @@ Example:
huh_encore:
templates:
imports:
- { name: default_css, template: "@HeimrichHannotContaoEncore/encore_css_imports.html.twig" }
- { name: default_js, template: "@HeimrichHannotContaoEncore/encore_js_imports.html.twig" }
- { name: default_css, template: "@HeimrichHannotEncore/encore_css_imports.html.twig" }
- { name: default_js, template: "@HeimrichHannotEncore/encore_js_imports.html.twig" }
```
2 changes: 1 addition & 1 deletion src/Command/PrepareCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
if (!empty($encoreJsEntries)) {
$this->io->text(['', ' // Output encore_bundles.js', '']);

$content = $this->twig->render('@HeimrichHannotContaoEncore/encore_bundles.js.twig', [
$content = $this->twig->render('@HeimrichHannotEncore/encore_bundles.js.twig', [
'entries' => $encoreJsEntries,
'skipEntries' => $skipEntries,
]);
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function getConfigTreeBuilder()
->cannotBeEmpty()
->end()
->scalarNode('template')
->info('Full references twig template path. Example: @HeimrichHannotContaoEncore/encore_css_imports.html.twig')
->info('Full references twig template path. Example: @HeimrichHannotEncore/encore_css_imports.html.twig')
->isRequired()
->cannotBeEmpty()
->end()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function onLoadDataContainer(string $table): void
'exclude' => true,
'default' => true,
'inputType' => 'checkbox',
'eval' => ['tl_class' => 'w50', 'groupStyle' => 'width: 65px'],
'eval' => ['tl_class' => 'w50', 'groupStyle' => 'width: 70px;align-self: center;'],
],
],
$field['eval']['multiColumnEditor']['fields']
Expand Down
6 changes: 3 additions & 3 deletions tests/Asset/TemplateAssetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ public function createTestInstance(array $parameters = [], $instanceMock = null)
$parameters['bundleConfig'] = [
'templates' => [
'imports' => [
['name' => 'default_css', 'template' => '@HeimrichHannotContaoEncore/encore_css_imports.html.twig'],
['name' => 'default_js', 'template' => '@HeimrichHannotContaoEncore/encore_js_imports.html.twig'],
['name' => 'default_head_js', 'template' => '@HeimrichHannotContaoEncore/encore_head_js_imports.html.twig'],
['name' => 'default_css', 'template' => '@HeimrichHannotEncore/encore_css_imports.html.twig'],
['name' => 'default_js', 'template' => '@HeimrichHannotEncore/encore_js_imports.html.twig'],
['name' => 'default_head_js', 'template' => '@HeimrichHannotEncore/encore_head_js_imports.html.twig'],
],
],
];
Expand Down

0 comments on commit 2864908

Please sign in to comment.