Skip to content

Commit

Permalink
feat(bootstrap): updated bootstrap 4.0.0 up to 4.5.3 (#6206)
Browse files Browse the repository at this point in the history
  • Loading branch information
SvetlanaMuravlova authored Jul 16, 2021
1 parent fbb7c73 commit 67736e0
Show file tree
Hide file tree
Showing 14 changed files with 8,388 additions and 7,144 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ You will need to add bootstrap css:
- `Bootstrap 4`
```
<!--- index.html -->
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.3/css/bootstrap.min.css" rel="stylesheet">
```


Expand Down
2 changes: 1 addition & 1 deletion apps/ngx-bootstrap-docs/src/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -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-4.0.0/css/bootstrap.min.css">
<link rel="stylesheet" class="style-manager-theme" href='assets/css/bootstrap-4.5.3/css/bootstrap.min.css'>
<!--<link rel="stylesheet" href="assets/css/style.css">-->
<!--<link rel="stylesheet" href="assets/css/prettify-angulario.css">-->

Expand Down

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/ngx-bootstrap-docs/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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-4.0.0/css/bootstrap.min.css'>
<link rel="stylesheet" class="style-manager-theme" href='assets/css/bootstrap-4.5.3/css/bootstrap.min.css'>
<!--<link rel="stylesheet" href="assets/css/style.css">-->
<!--<link rel="stylesheet" href="assets/css/prettify-angulario.css">-->

Expand Down
2 changes: 1 addition & 1 deletion apps/ngx-bootstrap-docs/src/ngsw-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"url": "assets/css/bootstrap-3.3.7/css/bootstrap.min.css"
},
{
"url": "assets/css/bootstrap-4.0.0/css/bootstrap.min.css"
"url": "assets/css/bootstrap-4.5.3/css/bootstrap.min.css"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ <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://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"</span><span
class="atv">"https://maxcdn.bootstrapcdn.com/bootstrap/4.5.3/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="tag">&gt;</span></pre>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { StyleManager } from '../../theme/style-manager';
import { ThemeStorage } from '../../theme/theme-storage';
import { Router } from '@angular/router';

const _bs4Css = 'assets/css/bootstrap-4.0.0/css/bootstrap.min.css';
const _bs4Css = 'assets/css/bootstrap-4.5.3/css/bootstrap.min.css';

@Component({
// eslint-disable-next-line @angular-eslint/component-selector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs';
import { DOCS_TOKENS } from '../../tokens/docs-routes-token';

const _bs3Css = 'assets/css/bootstrap-3.3.7/css/bootstrap.min.css';
const _bs4Css = 'assets/css/bootstrap-4.0.0/css/bootstrap.min.css';
const _bs4Css = 'assets/css/bootstrap-4.5.3/css/bootstrap.min.css';

@Component({
// eslint-disable-next-line @angular-eslint/component-selector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { isBs3 } from 'ngx-bootstrap/utils';
import { NgxModuleData } from './app.module';

export function getIndexHtmlCode(tag: string, component: NgxModuleData) {
return `<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/${isBs3() ? '3.3.7' : '4.0.0'}/css/bootstrap.min.css">
return `<link rel="stylesheet" href=${isBs3() ? "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" : "https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css"} crossorigin=${!isBs3() ? "anonymous" : undefined} integrity=${!isBs3() ? "sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" : undefined}>
<link rel="stylesheet" href="https://unpkg.com/ngx-bootstrap/datepicker/bs-datepicker.css">
<div class="card-header mb-2 well">
This demo shows functionality of <strong>${component.moduleFolder}</strong> from <strong>ngx-bootstrap.</strong><br/>
Expand Down
Loading

0 comments on commit 67736e0

Please sign in to comment.