From 28b123ff07b5d453c849c35222c3e958ec3a2b34 Mon Sep 17 00:00:00 2001 From: Jonny Johannes Date: Sat, 20 Jan 2018 13:33:11 -0700 Subject: [PATCH 1/2] evangillespie/monsterCards#39. Add donate button, at the bottokm of the about page. Links to buymeacoffee.com. --- app/views/pages/about.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index c9d36a3..07d4e5d 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -11,5 +11,8 @@

Colin, Jonny, and Evan made this app together using the power of friendship. We play RPG games together in Calgary, Alberta.

<%= image_tag "dms.png" %>

+

+ Buy us a coffee +

From 6f159db5095345efd501e390298d9bad3ff741b4 Mon Sep 17 00:00:00 2001 From: Colin Sproule Date: Sat, 20 Jan 2018 14:13:02 -0700 Subject: [PATCH 2/2] Rearrange common information for readability hp, ac and speed are easier to read and challenge + xp have been moved under the title. --- app/assets/stylesheets/global.css | 5 +++++ app/views/monsters/show.html.erb | 32 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/global.css b/app/assets/stylesheets/global.css index 39edc72..5e0d229 100644 --- 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 index a42da1a..4eddb32 100644 --- a/app/views/monsters/show.html.erb +++ b/app/views/monsters/show.html.erb @@ -9,21 +9,27 @@

<%= @monster.name %>

-

<%= "#{@monster.size} #{@monster.monster_type}" %><%= " (#{@monster.subtype})" if @monster.subtype?%><%=", #{@monster.alignment}" %>

+

+ Challenge <%= @monster.cr %> (<%= number_with_delimiter(@monster.xp, :delimiter => ',')%> XP), + <%= "#{@monster.size} #{@monster.monster_type}" %> + <%= " (#{@monster.subtype})" if @monster.subtype?%> + <%=", #{@monster.alignment}" %> +

-
-
Challenge Rating
-
<%= @monster.cr %>
-
XP
-
<%= number_with_delimiter(@monster.xp, :delimiter => ',')%>
-
Armor Class
-
<%= @monster.ac %>
-
Hit Points
-
<%= "#{@monster.hp} (#{@monster.hit_dice})" %>
-
Speed
-
<%= @monster.speed %>
-
+

+ HP <%= "#{@monster.hp} (#{@monster.hit_dice})" %> + + + + AC <%= @monster.ac %> + + + + + SPD <%= @monster.speed %> + +