Skip to content

Commit d78ace6

Browse files
committed
Update Encore and tweak some of its settings
1 parent 31ce9ea commit d78ace6

24 files changed

+1146
-1330
lines changed

assets/scss/app.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182
44
$web-font-path: 'data:text/css;base64,';
55

6+
// Make sure the bootstrap-sass and lato fonts are resolved correctly
7+
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
8+
$lato-font-path: '~lato-font/fonts';
9+
610
@import "~bootswatch/flatly/variables";
711
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
812
@import "~bootswatch/flatly/bootswatch";

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/translation": "*",
2727
"symfony/twig-bundle": "*",
2828
"symfony/validator": "*",
29-
"symfony/webpack-encore-bundle": "^1.1",
29+
"symfony/webpack-encore-bundle": "^1.4",
3030
"symfony/yaml": "*",
3131
"tgalopin/html-sanitizer-bundle": "^1.1",
3232
"twig/extensions": "^1.5",

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"devDependencies": {
3-
"@symfony/webpack-encore": "^0.22.0",
3+
"@symfony/webpack-encore": "^0.26.0",
44
"bloodhound-js": "^1.2.3",
55
"bootstrap-sass": "^3.3.7",
66
"bootstrap-tagsinput": "^0.7.1",
77
"bootswatch": "^3.3.7",
8+
"core-js": "3",
89
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
910
"font-awesome": "^4.7.0",
1011
"highlight.js": "^9.12.0",
File renamed without changes.

public/build/1.a7e6a099.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/1.bdd72f15.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

public/build/2.8cd86b12.js

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/2.dbd2ede0.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)