Skip to content

Commit e0dacb9

Browse files
committed
chore: update bootstrap to ^4.0.0-alpha.5
Closes ng-bootstrap#915 BREAKING CHANGE: ng-boostrap now uses bootstrap 4.0.0-alpha.5, which modified the markup used to generate tooltip and popover arrows (see twbs/bootstrap#17238). Using ng-bootstrap with an older version of bootstrap will thus not display tooltip and popover arrows anymore.
1 parent cbfa23b commit e0dacb9

File tree

8 files changed

+6
-8
lines changed

8 files changed

+6
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Check all the directives in action at https://ng-bootstrap.github.io
1919

2020
## Dependencies
2121
* [Angular 2](https://angular.io) (tested with 2.0.0)
22-
* [Bootstrap 4](https://v4-alpha.getbootstrap.com) (tested with 4.0.0-alpha.4)
22+
* [Bootstrap 4](https://v4-alpha.getbootstrap.com) (tested with 4.0.0-alpha.5)
2323

2424
## Installation
2525
After installing the above dependencies, install `ng-bootstrap` via:

demo/src/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<a class="nav-link" [routerLink]="['/components']">Components</a>
1111
</li>
1212
</ul>
13-
<p class="github-buttons pull-lg-right">
13+
<p class="github-buttons float-lg-right">
1414
<a class="github-button"
1515
href="https://github.com/ng-bootstrap/ng-bootstrap"
1616
target="_blank"

demo/src/app/components/shared/example-box/example-box.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span class="h3">
55
{{ demoTitle }}
66
</span>
7-
<div class="pull-xs-right">
7+
<div class="float-xs-right">
88
<img role="button" src="img/code-icon.png" (click)="toggleCode()" title="Show source code"/>
99
<a target="_blank" href="app/components/{{component}}/demos/{{demo}}/plnkr.html" title="Edit in Plnkr" >
1010
<img src="img/plunker-icon.png" height="24" width="24"/>

demo/src/app/getting-started/getting-started.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3>
1111
<a href="https://angular.io" target="_blank">Angular</a> (<em>requires</em> Angular version 2 or higher, tested with 2.0.0)
1212
</li>
1313
<li>
14-
<a href="http://v4-alpha.getbootstrap.com" target="_blank">Bootstrap CSS</a> (tested with 4.0.0-alpha.4)
14+
<a href="http://v4-alpha.getbootstrap.com" target="_blank">Bootstrap CSS</a> (tested with 4.0.0-alpha.5)
1515
</li>
1616
</ul>
1717
<h3>

demo/src/app/shared/content-wrapper/content-wrapper.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h1>{{ component }}</h1>
44
</div>
55
</div>
66
<div class="container">
7-
<div class="col-md-9 col-md-pull-3">
7+
<div class="col-md-9 col-md-float-3">
88
<ng-content></ng-content>
99
</div>
1010
<div class="col-md-3 col-md-push-9">

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@angular/router": "3.0.0",
3838
"angular2-template-loader": "^0.4.0",
3939
"autoprefixer": "^6.3.6",
40-
"bootstrap": "^4.0.0-alpha.4",
40+
"bootstrap": "^4.0.0-alpha.5",
4141
"clang-format": "1.0.35",
4242
"classlist-polyfill": "^1.0.3",
4343
"copy-webpack-plugin": "^3.0.1",

src/popover/popover.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {NgbPopoverConfig} from './popover-config';
2727
changeDetection: ChangeDetectionStrategy.OnPush,
2828
host: {'[class]': '"popover in popover-" + placement', 'role': 'tooltip'},
2929
template: `
30-
<div class="popover-arrow"></div>
3130
<h3 class="popover-title">{{title}}</h3><div class="popover-content"><ng-content></ng-content></div>
3231
`
3332
})

src/tooltip/tooltip.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {NgbTooltipConfig} from './tooltip-config';
2727
changeDetection: ChangeDetectionStrategy.OnPush,
2828
host: {'[class]': '"tooltip in tooltip-" + placement', 'role': 'tooltip'},
2929
template: `
30-
<div class="tooltip-arrow"></div>
3130
<div class="tooltip-inner"><ng-content></ng-content></div>
3231
`
3332
})

0 commit comments

Comments
 (0)