From ed4a64c60d96ed2ba377a73201c43b558b7f915b Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Tue, 11 Dec 2012 21:47:38 -0800
Subject: Open registration, tweak directory CSS

---
 views/main/merchants.html | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'views/main/merchants.html')

diff --git a/views/main/merchants.html b/views/main/merchants.html
index d8aafaa9..b8a8c614 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -1,4 +1,4 @@
-<div class="container-fluid directory">
+<div class="container-fluid">
   <div class="row-fluid">
     <div class="span6">
       <h1>Merchants</h1>
@@ -10,26 +10,28 @@
   </div>
 
   <div class="row-fluid">
-    <div class="span4">
-      <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2>
-      <a href="http://pacificblissmassage.com/"><img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" alt="Pacific Bliss" /></a>
-      <p style="overflow: hidden">
-      Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach!
-      </p>
-    </div>
+    <div class="span12">
+      <div class="directory">
+        <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2>
+        <a href="http://pacificblissmassage.com/"><img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" alt="Pacific Bliss" /></a>
+        <p style="overflow: hidden">
+        Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach!
+        </p>
+      </div>
 
-    <div class="span4">
-      <h2><a href="http://www.sweettoothcafe.ca/">Sweet Tooth Cafe</a></h2>
-      <a href="http://www.sweettoothcafe.ca/"><img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" alt="Sweet Tooth Cafe" /></a>
-      <p>
-      Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai and homemade soup to Italian specialty coffee drinks, all made right in front of you
-      </p>
-    </div>
+      <div class="directory">
+        <h2><a href="http://www.sweettoothcafe.ca/">Sweet Tooth Cafe</a></h2>
+        <a href="http://www.sweettoothcafe.ca/"><img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" alt="Sweet Tooth Cafe" /></a>
+        <p>
+        Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai and homemade soup to Italian specialty coffee drinks, all made right in front of you
+        </p>
+      </div>
 
-    <div class="span4">
-      <h2>Divan Kitchen</h2>
-      <img src="http://sphotos-g.ak.fbcdn.net/hphotos-ak-prn1/150071_116421141753535_3214357_n.jpg" />
-      <p>Authentic Turkish kebab and desserts</p>
+      <div class="directory">
+        <h2>Divan Kitchen</h2>
+        <img src="http://sphotos-g.ak.fbcdn.net/hphotos-ak-prn1/150071_116421141753535_3214357_n.jpg" />
+        <p>Authentic Turkish kebab and desserts</p>
+      </div>
     </div>
   </div>
 </div>
-- 
cgit v1.2.3