Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
// see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182
$web-font-path: 'data:text/css;base64,';

// Make sure the bootstrap-sass and lato fonts are resolved correctly
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
$lato-font-path: '~lato-font/fonts';

@import "~bootswatch/flatly/variables";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "~bootswatch/flatly/bootswatch";
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"symfony/translation": "*",
"symfony/twig-bundle": "*",
"symfony/validator": "*",
"symfony/webpack-encore-bundle": "^1.1",
"symfony/webpack-encore-bundle": "^1.4",
"symfony/yaml": "*",
"tgalopin/html-sanitizer-bundle": "^1.1",
"twig/extensions": "^1.5",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"devDependencies": {
"@symfony/webpack-encore": "^0.22.0",
"@symfony/webpack-encore": "^0.26.0",
"bloodhound-js": "^1.2.3",
"bootstrap-sass": "^3.3.7",
"bootstrap-tagsinput": "^0.7.1",
"bootswatch": "^3.3.7",
"core-js": "^3.0.0",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"font-awesome": "^4.7.0",
"highlight.js": "^9.12.0",
Expand Down
File renamed without changes.
42 changes: 0 additions & 42 deletions public/build/1.8ed0c19a.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/1.a7e6a099.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions public/build/2.1a0b5d31.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/2.32ddb789.css

This file was deleted.

1 change: 0 additions & 1 deletion public/build/2.ed209f1d.js

This file was deleted.

Loading