diff options
| author | Sonja Galovic <galovicsonja@gmail.com> | 2022-03-15 21:32:58 +0100 |
|---|---|---|
| committer | Sonja Galovic <galovicsonja@gmail.com> | 2022-03-15 21:32:58 +0100 |
| commit | d6c8dc0a22cfe3cb0ed1579f5dc7c4c0e6d9b3de (patch) | |
| tree | d5e8d368d08f2168e66438f486706af530b3b9c4 /frontend/angular.json | |
| parent | ca592566e80a7a83fff85e0b5a11bcca06f7e017 (diff) | |
| parent | f6496f86182902f2a6e5e34554ae93116d04c5b6 (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
Diffstat (limited to 'frontend/angular.json')
| -rw-r--r-- | frontend/angular.json | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/frontend/angular.json b/frontend/angular.json index 14028ae5..b1aaac3f 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -29,9 +29,12 @@ "styles": [ "src/custom-theme.scss", "node_modules/bootstrap/dist/css/bootstrap.min.css", - "src/styles.css" + "src/styles.css", + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], - "scripts": ["node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"] + "scripts": [ + "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js" + ] }, "configurations": { "production": { @@ -96,6 +99,7 @@ "src/assets" ], "styles": [ + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.css" ], "scripts": [] @@ -105,4 +109,4 @@ } }, "defaultProject": "frontend" -} +}
\ No newline at end of file |