Skip to content

Commit f9c9d1a

Browse files
committed
1 parent 2e282f6 commit f9c9d1a

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@angularclass/hmr": "^1.2.2",
4040
"@angularclass/hmr-loader": "^3.0.2",
4141
"aphrodite": "^1.1.0",
42-
"bootstrap": "4.0.0-alpha.5",
42+
"bootstrap": "4.0.0-alpha.6",
4343
"core-js": "^2.4.1",
4444
"jwt-decode": "^2.1.0",
4545
"lodash-es": "^4.16.6",

src/app/components/header/header.component.html

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<nav class="navbar navbar-fixed-top navbar-dark bg-inverse">
2-
<button class="navbar-toggler hidden-sm-up" type="button"
1+
<nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top">
2+
<button class="navbar-toggler navbar-toggler-right" type="button"
33
[mptStyles]="[styles.navbarToggler]" (click)="toggleMenu($event)">
4-
&#9776;
4+
<span class="navbar-toggler-icon"></span>
55
</button>
6-
<div class="navbar-toggleable-xs" id="exCollapsingNavbar2"
7-
[hidden]="isMenuHidden">
8-
<a class="navbar-brand" [routerLink]="['/']">SAMPLE APP</a>
9-
<ul class="nav navbar-nav">
6+
<a class="navbar-brand" [routerLink]="['/']">SAMPLE APP</a>
7+
<div class="navbar-collapse" [hidden]="isMenuHidden">
8+
9+
<ul class="navbar-nav mr-auto">
1010
<li class="nav-item" routerLinkActive="active" *ngIf="isSignedIn">
1111
<a class="nav-link" [routerLink]="['/home']">Home</a>
1212
</li>
@@ -25,7 +25,8 @@
2525
<a class="nav-link" [routerLink]="['/login']">Sign in</a>
2626
</li>
2727
</ul>
28-
<ul class="nav navbar-nav float-sm-right" *ngIf="isSignedIn">
28+
29+
<ul class="navbar-nav my-2 my-lg-0" *ngIf="isSignedIn">
2930
<li class="nav-item" routerLinkActive="active"
3031
[routerLinkActiveOptions]="{exact: true}">
3132
<a class="nav-link" [routerLink]="['/users/me']">Profile</a>
@@ -39,5 +40,6 @@
3940
(click)="logout(); $event.preventDefault()">Logout</a>
4041
</li>
4142
</ul>
43+
4244
</div>
4345
</nav>

yarn.lock

+7-7
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,12 @@ boom@2.x.x:
462462
dependencies:
463463
hoek "2.x.x"
464464

465-
bootstrap@4.0.0-alpha.5:
466-
version "4.0.0-alpha.5"
467-
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.5.tgz#a126b648c3bd2f52b8fad4bbc5e2d0ad2abf7064"
465+
bootstrap@4.0.0-alpha.6:
466+
version "4.0.0-alpha.6"
467+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8"
468468
dependencies:
469-
jquery "1.9.1 - 3"
470-
tether "^1.3.7"
469+
jquery ">=1.9.1"
470+
tether "^1.4.0"
471471

472472
bowser@^1.0.0:
473473
version "1.6.0"
@@ -2231,7 +2231,7 @@ jodid25519@^1.0.0:
22312231
dependencies:
22322232
jsbn "~0.1.0"
22332233

2234-
"jquery@1.9.1 - 3":
2234+
jquery@>=1.9.1:
22352235
version "3.1.1"
22362236
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.1.1.tgz#347c1c21c7e004115e0a4da32cece041fad3c8a3"
22372237

@@ -4241,7 +4241,7 @@ tar@~2.2.1:
42414241
fstream "^1.0.2"
42424242
inherits "2"
42434243

4244-
tether@^1.3.7:
4244+
tether@^1.4.0:
42454245
version "1.4.0"
42464246
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
42474247

0 commit comments

Comments
 (0)