Revert back to bootstrap2.3.2

meanjs · Oct 20, 2013 · 3561526 · 3561526
1 parent 1cc82ae
commit 3561526
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 33 deletions.
diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade
@@ -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-only/css/bootstrap.min.css')
-  link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap-theme.min.css')
+  link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap.css')
+  link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap-responsive.css')
   link(rel='stylesheet', href='/css/common.css')
 
   link(rel='stylesheet', href='/css/views/articles.css')

diff --git a/app/views/layouts/default.jade b/app/views/layouts/default.jade
@@ -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
-    .navbar.navbar-inverse(data-ng-include="'views/header.html'", data-role="navigation")
+    .navbar.navbar-inverse.navbar-fixed-top(data-ng-include="'views/header.html'", data-role="navigation")
     section.content
       section.container
         block content

diff --git a/public/views/articles/list.html b/public/views/articles/list.html
@@ -1,5 +1,5 @@
 <section data-ng-controller="ArticlesController" data-ng-init="find()">
-	<ul class="articles list-unstyled">
+	<ul class="articles unstyled">
 		<li data-ng-repeat="article in articles">
 			<span>{{article.created | date:'medium'}}</span> /
 			<span>{{article.user.name}}</span>

diff --git a/public/views/header.html b/public/views/header.html
@@ -1,30 +1,28 @@
-<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 in">
-        <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 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>