Updates to bootstrap and angular

AntJanus · Oct 15, 2013 · 286174a · 286174a
1 parent 760f58b
commit 286174a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 37 deletions.
diff --git a/bower.json b/bower.json
@@ -2,11 +2,9 @@
   "name": "genesis-skeleton",
   "version": "0.0.1",
   "dependencies": {
-    "angular": "~1.0.7",
-    "angular-mocks": "~1.0.7",
-    "angular-scenario": "~1.0.7",
-    "angular-strap": "~0.7.4",
-    "bootstrap": "~2.3.2",
+    "angular": "~1.2",
+    "angular-route": "~1.2",
+    "bootstrap": "~3.0",
     "html5shiv-dist": "~3.6.2",
     "modernizr": "~2.6.2"
   }

diff --git a/client/app/templates/home.html b/client/app/templates/home.html
@@ -9,39 +9,40 @@ <h1>Welcome!</h1>
 </section>
 
 <hr>
+<div class="container">
+  <div class="row">
+    <div class="npm packages col-md-6">
+      <h3><a href="https://npmjs.org/">NPM</a> Packages</h3>
 
-<div class="row-fluid">
-  <div class="npm packages span6">
-    <h3><a href="https://npmjs.org/">NPM</a> Packages</h3>
+      <table class="table table-striped table-bordered table-hover table-condensed">
+        <tbody>
+          <tr ng-repeat="(module, version) in server.data.dependencies | orderBy:module">
+            <th>
+              <a ng-href="https://npmjs.org/package/{{ module }}">{{ module }}</a>
+            </th>
+            <td class="text-right">
+              {{ version }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
 
-    <table class="table table-striped table-bordered table-hover table-condensed">
-      <tbody>
-        <tr ng-repeat="(module, version) in server.data.dependencies | orderBy:module">
-          <th>
-            <a ng-href="https://npmjs.org/package/{{ module }}">{{ module }}</a>
-          </th>
-          <td class="text-right">
-            {{ version }}
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-
-  <div class="bower packages span6">
-    <h3><a href="http://bower.io/">Bower</a> Packages</h3>
+    <div class="bower packages col-md-6">
+      <h3><a href="http://bower.io/">Bower</a> Packages</h3>
 
-    <table class="table table-striped table-bordered table-hover table-condensed">
-      <tbody>
-        <tr ng-repeat="(module, version) in client.data.dependencies">
-          <th>
-            {{ module }}
-          </th>
-          <td class="text-right">
-            {{ version }}
-          </td>
-        </tr>
-      </tbody>
-    </table>
+      <table class="table table-striped table-bordered table-hover table-condensed">
+        <tbody>
+          <tr ng-repeat="(module, version) in client.data.dependencies">
+            <th>
+              {{ module }}
+            </th>
+            <td class="text-right">
+              {{ version }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 </div>
diff --git a/client/index.html b/client/index.html
@@ -25,7 +25,7 @@
     <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
     <![endif]-->
 
-    <div class="container-fluid">
+    <div class="container">
       <header class="masthead">
         <h3>
           <a href="http://genesis-skeleton.com/" class="muted">Genesis Skeleton</a> <small>v{{ version }}</small>
@@ -49,6 +49,7 @@ <h3>
 
     <!-- build:js app/scripts/all.min.js -->
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/angular-route/angular-route.js"></script>
     <script src="bower_components/modernizr/modernizr.js"></script>
 
     <script src="app/scripts/app.js"></script>