Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.

Commit 0773d24

Browse files
committed
Updated to use @fyockm bootstrap-css-only repo. Changed header markup to use bootstrap 3
1 parent f77f715 commit 0773d24

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

app/views/includes/head.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ head
1919
meta(property='og:site_name', content='MEAN - A Modern Stack')
2020
meta(property='fb:admins', content='APP_ADMIN')
2121

22-
link(rel='stylesheet', href='/lib/bootstrap-css/index.css')
23-
link(rel='stylesheet', href='/lib/bootstrap-responsive-css/index.css')
22+
link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap.min.css')
23+
link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap-theme.min.css')
2424
link(rel='stylesheet', href='/css/common.css')
2525

2626
link(rel='stylesheet', href='/css/views/articles.css')

app/views/layouts/default.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
html(lang='en', xmlns='http://www.w3.org/1999/xhtml', xmlns:fb='https://www.facebook.com/2008/fbml', itemscope='itemscope', itemtype='http://schema.org/Product')
33
include ../includes/head
44
body
5-
header.navbar.navbar-fixed-top.navbar-inverse(data-ng-include="'views/header.html'")
5+
.navbar.navbar-inverse.navbar-fixed-top(data-ng-include="'views/header.html'", data-role="navigation")
66
section.content
77
section.container
88
block content

bower.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
"name": "mean",
33
"version": "1.0.0",
44
"dependencies": {
5-
"bootstrap-css": "https://raw.github.com/twbs/bootstrap/v2.3.2/docs/assets/css/bootstrap.css",
6-
"bootstrap-responsive-css": "https://raw.github.com/twbs/bootstrap/v2.3.2/docs/assets/css/bootstrap-responsive.css",
5+
"bootstrap-css-only": "latest",
76
"angular": "~1.0.6",
87
"angular-resource": "~1.0.6",
98
"angular-cookies": "~1.0.6",
10-
"angular-bootstrap": "~0.4.0",
9+
"angular-bootstrap": "latest",
1110
"angular-ui-utils": "0.0.4",
1211
"json3": "~3.2.4"
1312
}

public/views/header.html

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
<div class="navbar-inner" data-ng-controller="HeaderController">
2-
<ul class="nav">
3-
<li>
4-
<a class="brand" href="/">MEAN - A Modern Stack</a>
5-
</li>
6-
<li data-ng-repeat="item in menu" data-ng-show="global.user" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
7-
<a href="#!/{{item.link}}">{{item.title}}</a>
8-
</li>
9-
</ul>
10-
<ul class="nav pull-right" data-ng-hide="global.authenticated">
11-
<li><a href="signup">Signup</a>
12-
</li>
13-
<li class="divider-vertical"></li>
14-
<li><a href="signin">Signin</a>
15-
</li>
16-
</ul>
17-
<ul class="nav pull-right" data-ng-show="global.authenticated">
18-
<li class="dropdown">
19-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
20-
{{global.user.name}} <b class="caret"></b>
21-
</a>
22-
<ul class="dropdown-menu">
23-
<li><a href="/signout">Signout</a>
24-
</li>
25-
</ul>
26-
</li>
27-
</ul>
1+
<div class="container" data-ng-controller="HeaderController">
2+
<div class="navbar-header">
3+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
4+
<span class="icon-bar"></span>
5+
<span class="icon-bar"></span>
6+
<span class="icon-bar"></span>
7+
</button>
8+
<a class="navbar-brand" href="/">MEAN - A Modern Stack</a>
9+
</div>
10+
<div class="navbar-collapse collapse">
11+
<ul class="nav navbar-nav">
12+
<li data-ng-repeat="item in menu" data-ng-show="global.user" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
13+
<a href="#!/{{item.link}}">{{item.title}}</a>
14+
</li>
15+
</ul>
16+
<ul class="nav navbar-nav navbar-right" data-ng-hide="global.authenticated">
17+
<li><a href="signup">Signup</a></li>
18+
<li class="divider-vertical"></li>
19+
<li><a href="signin">Signin</a></li>
20+
</ul>
21+
<ul class="nav navbar-nav navbar-right" data-ng-show="global.authenticated">
22+
<li class="dropdown">
23+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{global.user.name}} <b class="caret"></b></a>
24+
<ul class="dropdown-menu">
25+
<li><a href="/signout">Signout</a></li>
26+
</ul>
27+
</li>
28+
</ul>
29+
</div>
2830
</div>

0 commit comments

Comments
 (0)