diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-04-06 13:14:00 +0200 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-04-06 13:14:00 +0200 |
| commit | 1b235bb4317477e673806ab9d2835a4dca48f88e (patch) | |
| tree | ccc776c46e2f68e4285c7298f10ea8f591058e50 /frontend/angular.json | |
| parent | af3333a77e254b3268de38ec397921b43f357949 (diff) | |
| parent | 480eb6a4e07b130129171d83ca9ba263dfba32c3 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/_pages/add-model/add-model.component.html
# frontend/src/app/_pages/add-model/add-model.component.ts
# frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/angular.json')
| -rw-r--r-- | frontend/angular.json | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/frontend/angular.json b/frontend/angular.json index b1aaac3f..f9825281 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -33,7 +33,10 @@ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [ - "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" + "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js", + "node_modules/jquery/dist/jquery.min.js", + "node_modules/popper.js/dist/popper.min.js", + "node_modules/bootstrap/dist/js/bootstrap.min.js" ] }, "configurations": { @@ -41,13 +44,13 @@ "budgets": [ { "type": "initial", - "maximumWarning": "500kb", - "maximumError": "1mb" + "maximumWarning": "2mb", + "maximumError": "4mb" }, { "type": "anyComponentStyle", - "maximumWarning": "2kb", - "maximumError": "4kb" + "maximumWarning": "10kb", + "maximumError": "15kb" } ], "fileReplacements": [ |