From 3d112a9e69240e93aedf40e53a9a341b0c177ada Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Mon, 20 Sep 2021 17:22:06 +0300 Subject: [PATCH 01/14] bootstrap 5 version update --- npm/ng-packs/angular.json | 2 +- npm/ng-packs/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index 074749db43..a235b85862 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -179,7 +179,7 @@ "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"], "styles": [ { - "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css", + "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css", "inject": false, "bundleName": "bootstrap-rtl.min" }, diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index da4d291dcd..71dc5d2742 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -67,7 +67,7 @@ "@angular/platform-browser-dynamic": "~12.2.0", "@angular/router": "~12.2.0", "@fortawesome/fontawesome-free": "^5.15.4", - "@ng-bootstrap/ng-bootstrap": "^7.0.0", + "@ng-bootstrap/ng-bootstrap": "^11.0.0-beta.2", "@ngneat/spectator": "^8.0.3", "@ngx-validate/core": "^0.0.13", "@nrwl/angular": "12.6.5", @@ -85,7 +85,7 @@ "@typescript-eslint/eslint-plugin": "~4.28.3", "@typescript-eslint/parser": "~4.28.3", "angular-oauth2-oidc": "^12.1.0", - "bootstrap": "^4.5.0", + "bootstrap": "^5.1.1", "chart.js": "^2.9.3", "cypress": "^7.3.0", "dotenv": "~10.0.0", From 2138e6efab7e41ddd691e1a6334aaad79102a0ea Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Mon, 20 Sep 2021 17:24:07 +0300 Subject: [PATCH 02/14] bootstrap 5 version update account package --- .../change-password.component.html | 14 +++++---- .../forgot-password.component.html | 10 ++++--- .../lib/components/login/login.component.html | 30 ++++++++++--------- .../personal-settings.component.html | 30 ++++++++++++------- .../register/register.component.html | 18 +++++++---- .../reset-password.component.html | 16 ++++++---- 6 files changed, 72 insertions(+), 46 deletions(-) diff --git a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html index 37ac7f0175..d7e0b6737b 100644 --- a/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.html @@ -1,6 +1,6 @@
-
-