summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--app/views/activities/_costs_and_requirements.html.erb1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d41a430..54c89eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@ All notable changes to this project will be documented in this file.
### Hearth
- Hearths now have locations, like characters do. All existing hearths are now located at Floret.
+### UI
+- Activity description is now displayed above costs and requirements.
+
### Web
- Favicon added (contributed by mattagarr).
diff --git a/app/views/activities/_costs_and_requirements.html.erb b/app/views/activities/_costs_and_requirements.html.erb
index 6ae66bb..5fb6f9b 100644
--- a/app/views/activities/_costs_and_requirements.html.erb
+++ b/app/views/activities/_costs_and_requirements.html.erb
@@ -1,5 +1,6 @@
<div class="text-sm border border-2 border-gray-700 rounded p-2 w-full">
<%= @text %>
+ <p class="text-xs italic"><%= @activity.description %></p>
<p>Costs:<strong> <%= @activity.costs&.join(", ") || "None" %></strong> </p>
<p>Requires:<strong> <%= @activity.requirements&.join(", ") || "None" %></strong> </p>
</div>