From efd99b61a39cfeca8e8364e8bd16ce168afdd4da Mon Sep 17 00:00:00 2001 From: Jose Ignacio Recuerda Cambil Date: Thu, 27 Sep 2018 17:09:59 +0200 Subject: [PATCH] TSK-728 - Update bootstrap version --- web/angular.json | 4 +- web/package-lock.json | 55 ++++++++++++++----- web/package.json | 3 +- web/src/assets/_main.scss | 1 + web/src/assets/_styles.scss | 8 --- .../bootstrap-3-backward-compatibility.scss | 5 ++ 6 files changed, 51 insertions(+), 25 deletions(-) delete mode 100644 web/src/assets/_styles.scss create mode 100644 web/src/assets/bootstrap-3-backward-compatibility.scss diff --git a/web/angular.json b/web/angular.json index d63cc964f..a58d57161 100644 --- a/web/angular.json +++ b/web/angular.json @@ -25,6 +25,7 @@ ], "scripts": [ "node_modules/jquery/dist/jquery.min.js", + "node_modules/popper.js/dist/umd/popper.min.js", "node_modules/bootstrap/dist/js/bootstrap.min.js" ] }, @@ -75,6 +76,7 @@ "tsConfig": "src/tsconfig.spec.json", "scripts": [ "node_modules/jquery/dist/jquery.min.js", + "node_modules/popper.js/dist/umd/popper.min.js", "node_modules/bootstrap/dist/js/bootstrap.min.js" ], "styles": [ @@ -114,4 +116,4 @@ "prefix": "app" } } -} \ No newline at end of file +} diff --git a/web/package-lock.json b/web/package-lock.json index 104f21a4e..270881b99 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -619,7 +619,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -828,12 +829,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -852,6 +855,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1087,6 +1091,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1130,7 +1135,8 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", @@ -2849,9 +2855,9 @@ } }, "bootstrap": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", - "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz", + "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==" }, "bootstrap-sass": { "version": "3.3.7", @@ -5397,7 +5403,8 @@ "fs.realpath": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "fstream": { "version": "1.0.11", @@ -5459,6 +5466,7 @@ "version": "7.1.2", "bundled": true, "dev": true, + "optional": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5511,7 +5519,8 @@ "hoek": { "version": "2.16.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "http-signature": { "version": "1.1.1", @@ -5528,6 +5537,7 @@ "version": "1.0.6", "bundled": true, "dev": true, + "optional": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -5652,6 +5662,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "1.1.7" } @@ -5769,7 +5780,8 @@ "path-is-absolute": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "performance-now": { "version": "0.2.0", @@ -5864,6 +5876,7 @@ "version": "2.6.1", "bundled": true, "dev": true, + "optional": true, "requires": { "glob": "^7.0.5" } @@ -8382,7 +8395,6 @@ "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -8551,7 +8563,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -11102,6 +11113,11 @@ } } }, + "popper.js": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.3.tgz", + "integrity": "sha1-FDj5jQRqz3tNeM1QK/QYrGTU8JU=" + }, "portfinder": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", @@ -14241,7 +14257,8 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -14252,7 +14269,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -14369,7 +14387,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -14381,6 +14400,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -14410,6 +14430,7 @@ "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -14428,6 +14449,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -14508,7 +14530,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -14520,6 +14543,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -14641,6 +14665,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/web/package.json b/web/package.json index 10f03b7fe..11f7a0aff 100644 --- a/web/package.json +++ b/web/package.json @@ -25,7 +25,7 @@ "ajv": "6.5.2", "angular-svg-icon": "6.0.0", "angular-tree-component": "7.1.0", - "bootstrap": "3.3.7", + "bootstrap": "4.1.3", "bootstrap-sass": "3.3.7", "chart.js": "2.7.2", "core-js": "2.5.3", @@ -35,6 +35,7 @@ "ng2-charts": "1.6.0", "ngx-bootstrap": "3.0.1", "node-sass": "4.9.2", + "popper.js": "1.14.3", "rxjs": "^6.2.2", "zone.js": "0.8.26" }, diff --git a/web/src/assets/_main.scss b/web/src/assets/_main.scss index 8dedc8e2f..5ed71e2e5 100644 --- a/web/src/assets/_main.scss +++ b/web/src/assets/_main.scss @@ -7,3 +7,4 @@ @import 'type-ahead'; @import 'checkboxes'; @import 'tabs'; +@import 'bootstrap-3-backward-compatibility'; diff --git a/web/src/assets/_styles.scss b/web/src/assets/_styles.scss deleted file mode 100644 index 128694a5c..000000000 --- a/web/src/assets/_styles.scss +++ /dev/null @@ -1,8 +0,0 @@ -@import 'variables'; -@import '../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap'; -@import '../../node_modules/angular-tree-component/dist/angular-tree-component.css'; -@import 'site'; -@import 'forms'; -@import 'tree'; -@import 'type-ahead'; -@import 'checkboxes'; \ No newline at end of file diff --git a/web/src/assets/bootstrap-3-backward-compatibility.scss b/web/src/assets/bootstrap-3-backward-compatibility.scss new file mode 100644 index 000000000..11adfb00a --- /dev/null +++ b/web/src/assets/bootstrap-3-backward-compatibility.scss @@ -0,0 +1,5 @@ +.dropdown-menu.show { + display: block; + opacity: 1; + visibility: visible; +}