Skip to content

Commit

Permalink
feat(package): upgrade to use bootstrap v4 (#3495)
Browse files Browse the repository at this point in the history
* feat(package): upgrade to use bootstrap v4

* chore(package): zonejs 0.8.20 doesn't wrap setInterval properly

* chore(package): ng cli missing devs
  • Loading branch information
valorkin authored Jan 19, 2018
1 parent 957d54b commit aa25e6a
Show file tree
Hide file tree
Showing 11 changed files with 220 additions and 207 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h2 id="installation-instructions">Installation instructions</h2>

<p>Or Bootstrap 4</p>
<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-beta/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>
</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="pln"> </span><span class="atn">rel</span><span class="pun">=</span><span class="atv">"stylesheet"</span><span class="tag">&gt;</span></pre>

<p>To enable bootstrap 4 theme templates in ngx-bootstrap, please read <a href="https://github.com/valor-software/ngx-bootstrap/blob/development/docs/getting-started/bootstrap4.md">here</a></p>
<pre class="prettyprint prettyprinted"><span class="com">&lt;!-- index.html --&gt;</span><span class="pln">
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/landing/landing.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { setTheme } from 'ngx-bootstrap/utils';
import { StyleManager } from '../../theme/style-manager';
import { ThemeStorage } from '../../theme/theme-storage';

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

@Component({
selector: 'landing',
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/common/sidebar/sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs/Subscription';
const _bs3Css =
'assets/css/bootstrap-3.3.7/css/bootstrap.min.css';
const _bs4Css =
'assets/css/bootstrap-4.0.0-beta/css/bootstrap.min.css';
'assets/css/bootstrap-4.0.0/css/bootstrap.min.css';

@Component({
selector: 'sidebar',
Expand Down

This file was deleted.

7 changes: 7 additions & 0 deletions demo/src/assets/css/bootstrap-4.0.0/css/bootstrap.min.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

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

Expand Down
Loading

0 comments on commit aa25e6a

Please sign in to comment.