Skip to content

Commit 38bb5df

Browse files
committed
Merge pull request #1543 from angular-fullstack/feat/move-navbar-footer-index
feat(client): move navbar and footer directive
2 parents 05fd495 + c429adb commit 38bb5df

File tree

11 files changed

+2
-20
lines changed

11 files changed

+2
-20
lines changed

app/templates/client/app/account(auth)/login/login(html).html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<navbar></navbar>
2-
31
<div class="container">
42
<div class="row">
53
<div class="col-sm-12">

app/templates/client/app/account(auth)/login/login(jade).jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
navbar
21
.container
32
.row
43
.col-sm-12

app/templates/client/app/account(auth)/settings/settings(html).html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<navbar></navbar>
2-
31
<div class="container">
42
<div class="row">
53
<div class="col-sm-12">

app/templates/client/app/account(auth)/settings/settings(jade).jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
navbar
21
.container
32
.row
43
.col-sm-12

app/templates/client/app/account(auth)/signup/signup(html).html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<navbar></navbar>
2-
31
<div class="container">
42
<div class="row">
53
<div class="col-sm-12">

app/templates/client/app/account(auth)/signup/signup(jade).jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
navbar
21
.container
32
.row
43
.col-sm-12

app/templates/client/app/admin(auth)/admin(html).html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<navbar></navbar>
2-
31
<div class="container">
42
<p>The delete user and user index api routes are restricted to users with the 'admin' role.</p>
53
<ul class="list-group user-list">

app/templates/client/app/admin(auth)/admin(jade).jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
navbar
21
.container
32
p
43
| The delete user and user index api routes are restricted to users with the 'admin' role.

app/templates/client/app/main/main(html).html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<navbar></navbar>
2-
31
<header class="hero-unit" id="banner">
42
<div class="container">
53
<h1>'Allo, 'Allo!</h1>
@@ -28,5 +26,3 @@ <h1 class="page-header">Features:</h1>
2826
</p>
2927
</form><% } %>
3028
</div>
31-
32-
<footer></footer>

app/templates/client/app/main/main(jade).jade

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
navbar
2-
31
header#banner.hero-unit
42
.container
53
h1 'Allo, 'Allo!
@@ -22,5 +20,3 @@ header#banner.hero-unit
2220
input.form-control(type='text', placeholder='Add a new thing here.', ng-model='main.newThing')
2321
span.input-group-btn
2422
button.btn.btn-primary(type='submit', ng-click='main.addThing()') Add New<% } %>
25-
26-
footer

0 commit comments

Comments
 (0)