From cdcfe20e3799b1e529aac2a5c32fbd5b568c1e21 Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Mon, 18 Aug 2014 16:58:18 +0200
Subject: [PATCH] added col-offset

---
 views/index.html  |  2 +-
 views/index.html~ | 59 -----------------------------------------------
 2 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 views/index.html~

diff --git a/views/index.html b/views/index.html
index 352226d..e56a390 100644
--- a/views/index.html
+++ b/views/index.html
@@ -27,7 +27,7 @@
 </form>
 {if="$recent_public"}
 <div class="row recent-margin">
-  <div class="col-md-8">
+  <div class="col-md-offset-2 col-md-8">
     <h4>Recent Answers by others:</h4>
     <table class="table table-responsive table-bordered table-condensed">
       <tbody>
diff --git a/views/index.html~ b/views/index.html~
deleted file mode 100644
index 6dc41c1..0000000
--- a/views/index.html~
+++ /dev/null
@@ -1,59 +0,0 @@
-{include="layout"}
-{include="navbar"}
-<div class="container">
-{if="$message"}
-<div class="alert alert-info">{$message}</div>
-{/if}
-<h1 class="text-center">{$site_name}!</h1>
-<form method="POST">
-  <p class="text-center">Want to tell them who you are? <input name="author" type="text" class="input-xs" placeholder="Anonymous"></p>
-  <div class="row">
-    <div class="col-md-4 rowm">
-      <input name="word1" type="text" class="form-control" placeholder="First Word">
-    </div>
-    <div class="col-md-4 rowm">
-      <input name="word2" type="text" class="form-control" placeholder="Second Word">
-    </div>
-    <div class="col-md-4 rowm">
-      <input name="word3" type="text" class="form-control" placeholder="Third Word">
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-4 col-md-offset-4">
-      <button type="submit" class="btn btn-primary btn-block btn-lg">Submit</button>
-    </div>
-  </div>
-  <input type="hidden" name="words">
-</form>
-<<<<<<< HEAD
-{if="$recent_answers"}
-<div class="row recent-margin">
-  <div class="col-md-8">
-    <h4>Recent Answers by others:</h4>
-    <table class="table table-responsive table-bordered table-condensed">
-      <tbody>
-        {loop="$recent"}
-          <tr>
-            <td><b>{$value.author}</b> wrote that {$user_name} is <span class="label label-default">{$value.word1}</span>, <span class="label label-default">{$value.word2}</span> and <span class="label label-default">{$value.word3}</span></td>
-          </tr>
-        {/loop}
-      </tbody>
-    </table>
-  </div>
-</div>
-=======
-{if="$recent_public"}
-<h4>Recent Answers by others:</h4>
-<table class="table table-responsive table-bordered table-condensed">
-  <tbody>
-    {loop="$words"}
-      <tr>
-        <td><b>{$value.author}</b> wrote that {$user_name} is <span class="label label-default">{$value.word1}</span>, <span class="label label-default">{$value.word2}</span> and <span class="label label-default">{$value.word3}</span></td>
-      </tr>
-    {/loop}
-  </tbody>
-</table>
->>>>>>> 95c4db170369fc5edd52d9277936175e39c5816c
-{/if}
-</div>
-{include="footer"}
\ No newline at end of file