Merge

2014-03-18 21:30:12 +01:00 · 2014-03-18 21:30:12 +01:00 · 3af9bad30e
commit 3af9bad30e
parent 2ccd37a7af
92 changed files with 2089 additions and 10693 deletions
--- a/app/views/admin/people/index.html.haml
+++ b/app/views/admin/people/index.html.haml
@ -1,15 +1,14 @@
-.row-fluid
-  .span6
-    %h2
-      People
-      - if @people
-        = "(#{@people.length})"
-  .span6
-    .pull-right{:style=>"margin-top:20px; margin-bottom:20px;"}
-      = link_to "New person", new_admin_person_path, :class => "btn btn-success"
+.row
+  .col-md-12
+    .page-header
+      %h1
+        People
+        - if @people
+          = "(#{@people.length})"
+        = link_to "New person", new_admin_person_path, :class => "btn btn-success pull-right"

-.row-fluid
-  .span12
+.row
+  .col-md-12
    .well
      %table.table.table-striped.table-bordered.table-hover#people
        %thead