feat(dootstrap): updated default version up to 5.2.3

valor-software · Jan 5, 2023 · d1686b3 · d1686b3
1 parent b9c9f8d
commit d1686b3
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 47 deletions.
diff --git a/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.1.0/css/bootstrap.min.css b/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.1.0/css/bootstrap.min.css
diff --git a/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.1.0/css/bootstrap.min.css.map b/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.1.0/css/bootstrap.min.css.map
diff --git a/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.2.3/css/bootstrap.min.css b/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.2.3/css/bootstrap.min.css
diff --git a/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.2.3/css/bootstrap.min.css.map b/apps/ngx-bootstrap-docs/src/assets/css/bootstrap-5.2.3/css/bootstrap.min.css.map
diff --git a/apps/ngx-bootstrap-docs/src/index.html b/apps/ngx-bootstrap-docs/src/index.html
@@ -12,7 +12,7 @@
   <link rel="author" href="https://github.com/valor-software/ngx-bootstrap/graphs/contributors">
 
   <!--link to bootstrap.css-->
-  <link rel="stylesheet" class="style-manager-theme" href='assets/css/bootstrap-5.1.0/css/bootstrap.min.css'>
+  <link rel="stylesheet" class="style-manager-theme" href='assets/css/bootstrap-5.2.3/css/bootstrap.min.css'>
   <!--<link rel="stylesheet" href="assets/css/style.css">-->
   <!--<link rel="stylesheet" href="assets/css/prettify-angulario.css">-->
 

diff --git a/apps/ngx-bootstrap-docs/src/ngsw-manifest.json b/apps/ngx-bootstrap-docs/src/ngsw-manifest.json
@@ -10,7 +10,7 @@
   "external": {
     "urls": [
       {
-        "url": "assets/css/bootstrap-5.1.0/css/bootstrap.min.css"
+        "url": "assets/css/bootstrap-5.2.3/css/bootstrap.min.css"
       },
       {
         "url": "assets/css/bootstrap-4.5.3/css/bootstrap.min.css"

diff --git a/libs/common-docs/src/lib/common/documentation/documentation.component.html b/libs/common-docs/src/lib/common/documentation/documentation.component.html
@@ -4,7 +4,7 @@
       <div class="title-box">
         <h1>Welcome to ngx-bootstrap!</h1>
         <p>
-          The best way to quickly integrate <a href="https://getbootstrap.com/docs/5.1" target="_blank">Bootstrap 5 </a> or <a href="https://getbootstrap.com/docs/4.0" target="_blank">Bootstrap 4 </a> Components with Angular
+          The best way to quickly integrate <a href="https://getbootstrap.com/docs/5.2" target="_blank">Bootstrap 5 </a> or <a href="https://getbootstrap.com/docs/4.0" target="_blank">Bootstrap 4 </a> Components with Angular
         </p>
         <div class="statistic-box">
           <a href="https://npmjs.org/ngx-bootstrap" target="_blank">
@@ -134,11 +134,11 @@ <h4>Manual way</h4>
       <pre class="prettyprint prettyprinted"><span class="com">&lt;!--- index.html --&gt;</span><span
         class="pln"></span>
 <span class="tag">&lt;link</span><span class="pln"> </span><span class="atn">href</span><span class="pun">=</span><span
-          class="atv">"https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css"</span><span
+          class="atv">"https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"</span><span
           class="pln"> </span><span class="atn">rel</span><span class="pun">=</span><span
           class="atv">"stylesheet"</span> <span class="atn">crossorigin</span><span class="pun">=</span><span
           class="atv">"anonymous"</span> <span class="atn">integrity</span><span class="pun">=</span><span
-          class="atv">"sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We"</span><span class="tag">&gt;</span></pre>
+          class="atv">"sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65"</span><span class="tag">&gt;</span></pre>
 
       <ul>
         <li><code>Bootstrap 4</code></li>
@@ -179,7 +179,7 @@ <h3>Setting up the bootstrap version manually</h3>
         class="typ">AppComponent</span><span class="pln"> </span><span class="pun">{{'{'}}</span>
   <span class="pln">  constructor</span><span class="pun">()</span><span class="pln"> </span><span
         class="pun">{{'{'}}</span>
-  <span class="pln">    setTheme</span><span class="pun">(</span><span class="str">'bs3'</span><span class="pun">);</span><span
+  <span class="pln">    setTheme</span><span class="pun">(</span><span class="str">'bs5'</span><span class="pun">);</span><span
         class="pln"> </span><span class="com">// or 'bs4'</span>
   <span class="pln">    <span class="pln">&hellip;</span></span>
   <span class="pln">  </span><span class="pun">{{'}'}}</span>
@@ -212,7 +212,7 @@ <h2 id="compatibility">
         <tbody>
         <tr>
           <th>10.x.x</th>
-          <th>14.x.x - 15.x.x</th>
+          <th>15.x.x</th>
           <th>5.x.x or 4.x.x</th>
         </tr>
         <tr>

diff --git a/libs/common-docs/src/lib/common/schematics/schematics.component.html b/libs/common-docs/src/lib/common/schematics/schematics.component.html
@@ -4,7 +4,7 @@
       <div class="title-box">
         <h1>Welcome to ngx-bootstrap!</h1>
         <p>
-          The best way to quickly integrate <a href="https://getbootstrap.com/docs/5.1" target="_blank">Bootstrap 5 </a> or <a href="https://getbootstrap.com/docs/4.0">Bootstrap 4 </a> Components with Angular
+          The best way to quickly integrate <a href="https://getbootstrap.com/docs/5.2" target="_blank">Bootstrap 5 </a> or <a href="https://getbootstrap.com/docs/4.0">Bootstrap 4 </a> Components with Angular
         </p>
         <div class="statistic-box">
           <a href="https://npmjs.org/ngx-bootstrap" target="_blank">
@@ -44,7 +44,7 @@ <h2 id="getting-started">
       <p>When you install ngx-bootstrap with Angular Cli Schematics you will get such updates:</p>
       <ul id="installation">
         <li><p><code>package.json</code></p>
-          <p>List of dependencies will be updated with 2 new packages <code>"bootstrap": "^5.1.3"</code>, <code>"ngx-bootstrap": "10.0.0"</code>. After packages will be installed and node_modules folder will be updated also.</p>
+          <p>List of dependencies will be updated with 2 new packages <code>"bootstrap": "^5.2.3"</code>, <code>"ngx-bootstrap": "10.x.x"</code>. After packages will be installed and node_modules folder will be updated also.</p>
         </li>
         <li id="style_updates"><p>Depending on which style extension is used in the project, schematics will add necessary imports or styles links. It, as expected, allows the use SCSS or CSS extensions.</p>
           <p>In case CSS extension - <code>angular.json</code> file will be updated.</p>

diff --git a/libs/common-docs/src/lib/common/sidebar/sidebar.component.ts b/libs/common-docs/src/lib/common/sidebar/sidebar.component.ts
@@ -16,7 +16,7 @@ import { initNestedRoutes } from './helpers/sidebar-helpers';
 import { Subscription } from "rxjs";
 
 const _bs4Css = 'assets/css/bootstrap-4.5.3/css/bootstrap.min.css';
-const _bs5Css = 'assets/css/bootstrap-5.1.0/css/bootstrap.min.css';
+const _bs5Css = 'assets/css/bootstrap-5.2.3/css/bootstrap.min.css';
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector

diff --git a/src/popover/popover-container.component.ts b/src/popover/popover-container.component.ts
@@ -14,27 +14,16 @@ import { PlacementForBs5, checkMargins, AvailbleBSPositions } from 'ngx-bootstra
     '[class.show]': '!_bsVersions.isBs3',
     '[class.bs3]': '_bsVersions.isBs3',
     role: 'tooltip',
-    style: 'display:block;'
+    style: 'display:block; position:absolute'
   },
   styles: [
     `
-    :host.bs3.popover-top {
-      margin-bottom: 10px;
-    }
-    :host.bs3.popover.top>.arrow {
-      margin-left: -2px;
-    }
-    :host.bs3.popover.top {
-      margin-bottom: 10px;
-    }
     :host.popover.bottom>.arrow {
       margin-left: -4px;
     }
-    :host.bs3.bs-popover-left {
-      margin-right: .5rem;
-    }
-    :host.bs3.bs-popover-right .arrow, :host.bs3.bs-popover-left .arrow{
-      margin: .3rem 0;
+
+    :host .popover-arrow {
+      position: absolute;
     }
     `
   ],

diff --git a/src/schematics/src/utils/current_dependency_versions.json b/src/schematics/src/utils/current_dependency_versions.json
@@ -1,4 +1,4 @@
 {
   "NGX_BOOTSTRAP_VERSION": "10.1.0",
-  "BOOTSTRAP_VERSION": "^5.1.3"
+  "BOOTSTRAP_VERSION": "^5.2.3"
 }
diff --git a/src/tooltip/tooltip-container.component.ts b/src/tooltip/tooltip-container.component.ts
@@ -22,18 +22,11 @@ import { PlacementForBs5 } from 'ngx-bootstrap/positioning';
     :host.tooltip {
       display: block;
       pointer-events: none;
+      position: absolute;
     }
-    :host.bs3.tooltip.top>.arrow {
-      margin-left: -2px;
-    }
-    :host.bs3.tooltip.bottom {
-      margin-top: 0px;
-    }
-    :host.bs3.bs-tooltip-left, :host.bs3.bs-tooltip-right{
-      margin: 0px;
-    }
-    :host.bs3.bs-tooltip-right .arrow, :host.bs3.bs-tooltip-left .arrow {
-      margin: .3rem 0;
+
+    :host.tooltip .tooltip-arrow {
+      position: absolute;
     }
   `
   ],

diff --git a/src/utils/utils.class.ts b/src/utils/utils.class.ts
@@ -27,8 +27,8 @@ export class Utils {
     const bsVer = currentBsVersion();
       return {
       crossorigin: "anonymous",
-      integrity: bsVer === 'bs5' ? 'sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We' : 'sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2',
-      cdnLink: bsVer === 'bs5' ? 'https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css' : 'https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css',
+      integrity: bsVer === 'bs5' ? 'sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65' : 'sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2',
+      cdnLink: bsVer === 'bs5' ? 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css' : 'https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css',
     };
    }
 }