diff --git a/web/package-lock.json b/web/package-lock.json index f3c690725..e461bd2cc 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -4118,11 +4118,6 @@ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" }, - "bootstrap-sass": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz", - "integrity": "sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==" - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/web/package.json b/web/package.json index 8a00a2449..8642e049d 100644 --- a/web/package.json +++ b/web/package.json @@ -33,7 +33,6 @@ "angular-svg-icon": "7.2.1", "angular-tree-component": "8.5.2", "bootstrap": "4.4.1", - "bootstrap-sass": "3.4.1", "core-js": "3.6.5", "file-saver": "1.3.3", "jquery": "3.5.0", diff --git a/web/src/theme/_bootstrap.scss b/web/src/theme/_bootstrap.scss deleted file mode 100644 index 5d0e31696..000000000 --- a/web/src/theme/_bootstrap.scss +++ /dev/null @@ -1,2 +0,0 @@ -$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/'; -@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap'; diff --git a/web/src/theme/_main.scss b/web/src/theme/_main.scss index 4366a6d2a..f1502c809 100644 --- a/web/src/theme/_main.scss +++ b/web/src/theme/_main.scss @@ -1,7 +1,8 @@ -@import 'bootstrap-3-backward-compatibility'; -@import 'variables'; -@import '../../node_modules/angular-tree-component/dist/angular-tree-component.css'; @import '../../node_modules/ngx-bootstrap/datepicker/bs-datepicker'; +@import '../../node_modules/angular-tree-component/dist/angular-tree-component.css'; +@import 'bootstrap-3-backward-compatibility'; + +@import 'variables'; @import 'material_styles'; @import 'site'; @import 'forms'; @@ -12,7 +13,6 @@ @import 'buttons'; @import 'tabs'; @import 'table'; -@import 'bootstrap-3-backward-compatibility'; @import 'mixin/colors'; @import 'progress-bar'; @import 'shameful';