From 2dd109d1e654762bfd36b94b2049cd58a61f3b59 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Sun, 7 Apr 2013 12:31:56 -0700
Subject: Merchants page update

---
 public/css/index.less      |   1 -
 public/img/lulie_lens.png  | Bin 0 -> 20340 bytes
 public/img/rocketcases.png | Bin 0 -> 1698 bytes
 views/main/merchants.html  |  26 +++++++++++++++++++++++---
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 public/img/lulie_lens.png
 create mode 100644 public/img/rocketcases.png

diff --git a/public/css/index.less b/public/css/index.less
index 93cdf9e4..a64c6432 100644
--- a/public/css/index.less
+++ b/public/css/index.less
@@ -23,7 +23,6 @@ footer {
 
 #ask, #bid { color: white; }
 div.directory { width: 500px; float: left;  border: 1px dashed #ccc; padding: 10px; margin: 10px; }
-.merchants div.directory { min-height: 400px; }
 div.directory img { height: 180px; float: left; padding-right: 10px; }
 div.directory p { font-size: 13px; }
 div.directory h2 a { text-decoration: none; color: #000; }
diff --git a/public/img/lulie_lens.png b/public/img/lulie_lens.png
new file mode 100644
index 00000000..b6e9d0f2
Binary files /dev/null and b/public/img/lulie_lens.png differ
diff --git a/public/img/rocketcases.png b/public/img/rocketcases.png
new file mode 100644
index 00000000..3c695b20
Binary files /dev/null and b/public/img/rocketcases.png differ
diff --git a/views/main/merchants.html b/views/main/merchants.html
index db5816cb..73a4ecfb 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -26,13 +26,11 @@
       </div>
       
       <div class="directory">
-        <h2><a href="http://nolimitlandscapes.com/">No Limit Landscaping</a></h2>
         <a href="http://nolimitlandscapes.com/"><img src="/img/nolimit.jpg" alt="No Limit Landscaping" /></a>
         <p style="clear: both; overflow: hidden">No Limit Landscaping is a new company formed in January of 2013. With over 20 years of experience in the industry, we will be focusing our expertise on the residential sector. We install full landscapes from start to finish. From designing to excavation to a completed landscape we will work with you through the entire process. Our water features set us apart from our competitors and are an excellent addition to any household.</p>
       </div>
 
       <div class="directory">
-        <h2><a href="http://yourlocalmoversbc.com/">Your Local Movers</a></h2>
         <a href="http://yourlocalmoversbc.com/"><img src="/img/yourlocalmovers.png" alt="Your Local Movers" /></a>
         <p style="clear: both">
         We can do anything from moves, deliveries, junk removal or even help moving something around the inside of your house!  No job is too big or small for us.
@@ -41,14 +39,36 @@ Your Local Movers provides service to the entire Lower Mainland as well as the S
         </p>
       </div>
 
+      <br style="clear: both" />
+
       <div class="directory">
-        <h2><a href="http://www.artofmuse.com/">Art of Muse</a></h2>
         <a href="http://www.artofmuse.com/"><img src="/img/artofmuse.png" alt="Art of Muse" /></a>
         <p style="clear: both; overflow: hidden">
         Music lessons for youth &amp; adults.  Learn how to play Piano or Keyboard from basic to intermediate levels. Whether you are interested in playing classical pieces or making pop, rock or electronic music, we will give you the skills and knowledge.
         </p>
       </div> 
 
+      <div class="directory">
+        <div style="background: #4e4e4e; color: #fff; width: 100%; height: 200px;">
+          <a href="http://www.lulielens.com/"><img src="/img/lulie_lens.png" alt="Lulie Lens" /></a>
+        </div>
+        <p style="clear: both; overflow: hidden; margin-top: 10px;">Lulie Talmor is a High End Freelance Retoucher that specializes in polishing beauty and fashion images for commercial and editorial projects. However, her Photoshop capabilities extend far beyond just that, so when in doubt, be sure to ask. By harnessing the power of the internet she is able to take clients from all around the world from her base here in Vancouver, BC. She also currently offers 10% off for those paying with Bitcoin!</p>
+      </div> 
+
+      <div class="directory">
+        <h2><a href="http://www.rocketcases.com/">Rocketcases</a></h2>
+        <a href="http://www.rocketcases.com/"><img src="/img/rocketcases.png" alt="Rocketcases" /></a>
+        <p style="clear: both; overflow: hidden">You need to protect your iPhone from falls, scratches and its plain looking exterior. We've got the perfect cases for that. You want something unique and original that also gives you peace of mind if your prized possession were to accidently slip from your fingers.
+        </p>
+        <p>
+        We want the same things. That is why we started Rocketcases. We wanted a case that was as cool as it was protective, so we set out to design the best. We'd never sell a case we wouldn't use ourselves.
+        </p>
+        <p>
+        Jim, Skye &amp; Jon.<br />
+        Rocketcases, Inc.
+        </p>
+      </div> 
+
       <div class="directory">
         <h2><a href="http://www.cabin12.ca/">Cabin 12 Restaurant</a></h2>
         <a href="http://www.cabin12.ca/"><img src="/img/cabin12.jpg" alt="Cabin 12 Restaurant" /></a>
-- 
cgit v1.2.3