Merge branch 'develop' of https://github.com/evangillespie/monsterCards…

… into develop
evangillespie · Jan 20, 2018 · 56d8e54 · 56d8e54
2 parents eeb823e + 14437c7
commit 56d8e54
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/app/assets/stylesheets/global.css b/app/assets/stylesheets/global.css
@@ -8,6 +8,11 @@ body {
   display: none
 }
 
+/* override tachyons style */
+abbr[title] {
+  text-decoration: none !important;
+}
+
 /* favourite icon */
 .favourite-toggle.faved .icon-favourite {fill: #FFB700; stroke: none;}
 .favourite-toggle.faved:hover .icon-favourite {fill: #FFB700; stroke: none;}

diff --git a/app/views/monsters/show.html.erb b/app/views/monsters/show.html.erb
@@ -9,21 +9,27 @@
     </a>
 
     <h2 class="mv0 f2-ns f3 lh-title"><%= @monster.name %></h2>
-    <p class="i mt0 lh-copy "><%= "#{@monster.size} #{@monster.monster_type}" %><%= " (#{@monster.subtype})" if @monster.subtype?%><%=", #{@monster.alignment}" %></p>
+    <p class="i mt0 lh-copy ">
+      <span class="b">Challenge <%= @monster.cr %> (<%= number_with_delimiter(@monster.xp, :delimiter => ',')%> XP)</span>,
+      <%= "#{@monster.size} #{@monster.monster_type}" %>
+      <%= " (#{@monster.subtype})" if @monster.subtype?%>
+      <%=", #{@monster.alignment}" %>
+    </p>
 
     <section class="bt bw2">
-      <dl class="lh-copy">
-        <dt class="fl b mr1">Challenge Rating</dt>
-        <dd class="ml0"><%= @monster.cr %></dd>
-        <dt class="fl b mr1">XP</dt>
-        <dd class="ml0"><%= number_with_delimiter(@monster.xp, :delimiter => ',')%></dd>
-        <dt class="fl b mr1">Armor Class</dt>
-        <dd class="ml0"><%= @monster.ac %></dd>
-        <dt class="fl b mr1">Hit Points</dt> 
-        <dd class="ml0"><%= "#{@monster.hp} (#{@monster.hit_dice})" %></dd>
-        <dt class="fl b mr1">Speed</dt>
-        <dd class="ml0"><%= @monster.speed %></dd>
-      </dl>
+      <p class="f4-ns lh-copy">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" width="16" height="16"><path d="M414.9 24C361.8 24 312 65.7 288 89.3 264 65.7 214.2 24 161.1 24 70.3 24 16 76.9 16 165.5c0 72.6 66.8 133.3 69.2 135.4l187 180.8c8.8 8.5 22.8 8.5 31.6 0l186.7-180.2c2.7-2.7 69.5-63.5 69.5-136C560 76.9 505.7 24 414.9 24z" style="fill: #FF4136;"/></svg> <abbr title="Hit Points" class="b">HP</abbr> <%= "#{@monster.hp} (#{@monster.hit_dice})" %>
+
+      <span class="ph2">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="16" height="16"><path d="M466.5 83.7l-192-80a48.15 48.15 0 0 0-36.9 0l-192 80C27.7 91.1 16 108.6 16 128c0 198.5 114.5 335.7 221.5 380.3 11.8 4.9 25.1 4.9 36.9 0C360.1 472.6 496 349.3 496 128c0-19.4-11.7-36.9-29.5-44.3z" style="fill: #19A974;" /></svg>
+        <abbr title="Armor Class" class="b">AC</abbr> <%= @monster.ac %>
+      </span>
+
+      <span class="dib">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="16" height="16"><path d="M256 8c137 0 248 111 248 248S393 504 256 504 8 393 8 256 119 8 256 8zm-28.9 143.6l75.5 72.4H120c-13.3 0-24 10.7-24 24v16c0 13.3 10.7 24 24 24h182.6l-75.5 72.4c-9.7 9.3-9.9 24.8-.4 34.3l11 10.9c9.4 9.4 24.6 9.4 33.9 0L404.3 273c9.4-9.4 9.4-24.6 0-33.9L271.6 106.3c-9.4-9.4-24.6-9.4-33.9 0l-11 10.9c-9.5 9.6-9.3 25.1.4 34.4z" style="fill: #408BC9;"/></svg>
+        <abbr title="Speed" class="b">SPD</abbr> <%= @monster.speed %>
+      </span>
+      </p>
     </section>
 
     <section class="bt bw2">

diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -11,5 +11,8 @@
 		<p>Colin, Jonny, and Evan made this app together using the power of friendship. We play RPG games together in Calgary, Alberta.</p>
 		<p class="lh-copy"></p>
 		<p><%= image_tag "dms.png" %></p>
+    <p>
+      <a class="f6 link dim br2 ph3 pv2 mb2 dib white bg-light-red" href="https://www.buymeacoffee.com/monstercards">Buy us a coffee</a>
+    </p>
 	</div>
 </article>