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

Commit

Permalink
Updated to use @fyockm bootstrap-css-only repo. Changed header markup…
Browse files Browse the repository at this point in the history
… to use bootstrap 3
  • Loading branch information
mrjasonweaver committed Oct 20, 2013
1 parent f77f715 commit 0773d24
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 33 deletions.
4 changes: 2 additions & 2 deletions app/views/includes/head.jade
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ head
meta(property='og:site_name', content='MEAN - A Modern Stack')
meta(property='fb:admins', content='APP_ADMIN')

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

link(rel='stylesheet', href='/css/views/articles.css')
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/default.jade
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
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')
include ../includes/head
body
header.navbar.navbar-fixed-top.navbar-inverse(data-ng-include="'views/header.html'")
.navbar.navbar-inverse.navbar-fixed-top(data-ng-include="'views/header.html'", data-role="navigation")
section.content
section.container
block content
Expand Down
5 changes: 2 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
"name": "mean",
"version": "1.0.0",
"dependencies": {
"bootstrap-css": "https://raw.github.com/twbs/bootstrap/v2.3.2/docs/assets/css/bootstrap.css",
"bootstrap-responsive-css": "https://raw.github.com/twbs/bootstrap/v2.3.2/docs/assets/css/bootstrap-responsive.css",
"bootstrap-css-only": "latest",
"angular": "~1.0.6",
"angular-resource": "~1.0.6",
"angular-cookies": "~1.0.6",
"angular-bootstrap": "~0.4.0",
"angular-bootstrap": "latest",
"angular-ui-utils": "0.0.4",
"json3": "~3.2.4"
}
Expand Down
56 changes: 29 additions & 27 deletions public/views/header.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
<div class="navbar-inner" data-ng-controller="HeaderController">
<ul class="nav">
<li>
<a class="brand" href="/">MEAN - A Modern Stack</a>
</li>
<li data-ng-repeat="item in menu" data-ng-show="global.user" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
<a href="#!/{{item.link}}">{{item.title}}</a>
</li>
</ul>
<ul class="nav pull-right" data-ng-hide="global.authenticated">
<li><a href="signup">Signup</a>
</li>
<li class="divider-vertical"></li>
<li><a href="signin">Signin</a>
</li>
</ul>
<ul class="nav pull-right" data-ng-show="global.authenticated">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{{global.user.name}} <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="/signout">Signout</a>
</li>
</ul>
</li>
</ul>
<div class="container" data-ng-controller="HeaderController">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">MEAN - A Modern Stack</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li data-ng-repeat="item in menu" data-ng-show="global.user" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
<a href="#!/{{item.link}}">{{item.title}}</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right" data-ng-hide="global.authenticated">
<li><a href="signup">Signup</a></li>
<li class="divider-vertical"></li>
<li><a href="signin">Signin</a></li>
</ul>
<ul class="nav navbar-nav navbar-right" data-ng-show="global.authenticated">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{global.user.name}} <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/signout">Signout</a></li>
</ul>
</li>
</ul>
</div>
</div>

0 comments on commit 0773d24

Please sign in to comment.