From be08568c3b383e85894c03e46ab234e2132a6ec8 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 13 May 2013 21:29:27 +0100
Subject: [PATCH] npcs: matt stable-master in the the pets tab (bravo
 @Shaners!). also include link to the pets spritesheet, and some info on
 mounts

---
 public/img/npcs/matt.png | Bin 0 -> 3166 bytes
 views/app/pets.html      |  63 ++++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 24 deletions(-)
 create mode 100644 public/img/npcs/matt.png

diff --git a/public/img/npcs/matt.png b/public/img/npcs/matt.png
new file mode 100644
index 0000000000000000000000000000000000000000..f70c173a1d3fb532785b15a6edd67325b40aa827
GIT binary patch
literal 3166
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

literal 0
HcmV?d00001

diff --git a/views/app/pets.html b/views/app/pets.html
index bba57f23ec..474934f06e 100644
--- a/views/app/pets.html
+++ b/views/app/pets.html
@@ -95,33 +95,48 @@
     </div>
 
 <stable:>
-    <div>{count(_user.items.pets)} / 90 Pets Found</div>
-    <table>
-        {{#each _items.pets as :pet}}
-            <tr>
-                {{#each _items.hatchingPotions as :potion}}
-                    <td>
-                        <app:pets:stable-pet tooltip="{{:potion.text}} {{:pet.text}}" pet="{{:pet.name}}-{{:potion.name}}" />
-                    </td>
+    <div class='row-fluid'>
+
+        <div class='span8'>
+            <!--<menu type="list">
+                <li class="customize-menu">
+                    <menu>
+                    </menu>
+                </li>
+            </menu>-->
+            <table>
+                {{#each _items.pets as :pet}}
+                    <tr>
+                        {{#each _items.hatchingPotions as :potion}}
+                            <td>
+                                <app:pets:stable-pet tooltip="{{:potion.text}} {{:pet.text}}" pet="{{:pet.name}}-{{:potion.name}}" />
+                            </td>
+                        {{/}}
+                    </tr>
                 {{/}}
-            </tr>
-        {{/}}
-    </table>
-    <h4>Rare Pets</h4>
-    <table>
-        <tr>
-            <td><app:pets:stable-pet potion='Veteran Wolf' pet="Wolf-Veteran" /></td>
-            {{#if gt(_user.backer.tier,79)}}<td><app:pets:stable-pet potion='Cerberus Pup' pet="Wolf-Cerberus" /></td>{{/}}
-        </tr>
-    </table>
+            </table>
+            <h4>Rare Pets</h4>
+            <table>
+                <tr>
+                    <td><app:pets:stable-pet potion='Veteran Wolf' pet="Wolf-Veteran" /></td>
+                    {{#if gt(_user.backer.tier,79)}}<td><app:pets:stable-pet potion='Cerberus Pup' pet="Wolf-Cerberus" /></td>{{/}}
+                </tr>
+            </table>
+        </div>
 
-    <!--<menu type="list">
-        <li class="customize-menu">
-            <menu>
+        <div class='span4' style='position:relative;'>
+            <img src='/img/npcs/matt.png' />
 
-            </menu>
-        </li>
-    </menu>-->
+            <div class="popover fade bottom in" style="top: 138px; left: 0px; display: block;">
+                <div class="arrow"></div>
+                <h3 class="popover-title">Matt Boche</h3>
+                <div class="popover-content">
+                    Welcome to the Stable! I'm <a target="_blank" href="http://www.kickstarter.com/profile/mattboch">Matt</a>, the beast master. Choose a pet here to adventure at your side - they aren't much help yet, but I forsee a time when they're able to <a href="_target" href="https://trello.com/card/mounts/50e5d3684fe3a7266b0036d6/221">grow into powerful steeds</a>! Until that day, <a target="_blank" href="https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png">have a look-see</a> at all the pets you can collect.
+                    <h4>{count(_user.items.pets)} / 90 Pets Found</h4>
+                </div>
+            </div>
+        </div>
+    </div>
 
 <stable-pet:>
     <div rel="tooltip" title="{{@tooltip}}">