Merge remote-tracking branch 'EvanDotPro/feature/updates'

PowerKiKi · Oct 17, 2012 · eeca131 · eeca131
2 parents 98c1354 + 3abc996
commit eeca131
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 624 deletions.
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -15,10 +15,12 @@
 
         <!-- Scripts -->
         <?php echo $this->headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',))
-                                      ->prependFile('//ajax.googleapis.com/ajax/libs/jquery/1.8/jquery.min.js') ?>
+                                      ->prependFile($this->basePath() . '/js/bootstrap.min.js')
+                                      ->prependFile($this->basePath() . '/js/jquery.min.js') ?>
+
     </head>
     <body>
-        <div class="navbar navbar-fixed-top">
+        <div class="navbar navbar-inverse navbar-fixed-top">
             <div class="navbar-inner">
                 <div class="container">
                     <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -27,7 +29,7 @@
                         <span class="icon-bar"></span>
                     </a>
                     <a class="brand" href="<?php echo $this->url('home') ?>"><?php echo $this->translate('Skeleton Application') ?></a>
-                    <div class="nav-collapse">
+                    <div class="nav-collapse collapse">
                         <ul class="nav">
                             <li class="active"><a href="<?php echo $this->url('home') ?>"><?php echo $this->translate('Home') ?></a></li>
                         </ul>

diff --git a/public/css/bootstrap-responsive.min.css b/public/css/bootstrap-responsive.min.css
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
diff --git a/public/js/bootstrap.min.js b/public/js/bootstrap.min.js
diff --git a/public/js/html5.js b/public/js/html5.js
diff --git a/public/js/jquery-1.7.2.min.js b/public/js/jquery-1.7.2.min.js
diff --git a/public/js/jquery.min.js b/public/js/jquery.min.js